owncloud/core — pull request #8260 by LukasReschke (2014-04-18 09:20:36+00:00)
Title: Backport of #8183 and #8197

Backport of #8183 and #8197

Litmus test passes successfully.