Merge pull request #4870 from owncloud/chore/changelog-update