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