Barkport 10934

Backport of https://github.com/owncloud/core/pull/10934 to stable7