owncloud/core — pull request #10645 by georgehrke (2014-08-26 17:43:07+00:00)
Title: Backport 7728

There were some merge conflicts, so I send a pr instead of just backporting it.

backport of https://github.com/owncloud/core/pull/7728

please review @PVince81 @scolebrook