owncloud/core — pull request #12253 by LukasReschke (2014-11-18 10:02:55+00:00)
Title: Port 12154

Port of #12154 to master