owncloud/core — pull request #7610 by LukasReschke (2014-03-06 21:49:04+00:00)
Title: Backport of https://github.com/owncloud/core/pull/7609

Backport of https://github.com/owncloud/core/pull/7609

@karlitschek @ser72 @MTRichards