backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6
Merge branch 'master' of github.com:owncloud/core