owncloud/core — pull request #8386 by blizzz (2014-04-28 17:21:03+00:00)
Title: Fix 6946 master

Straight port to master from https://github.com/owncloud/core/pull/7745

Please review @icewind1991 @DeepDiver1975