Take from https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle
Take from https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle

IljaN/core,owncloud/core,phil-davis/core,pollopolea/core,IljaN/core,sharidas/core,owncloud/core,pollopolea/core,sharidas/core,sharidas/core,owncloud/core,owncloud/core,owncloud/core,IljaN/core,pollopolea/core,IljaN/core,pollopolea/core,pollopolea/core,sharidas/core,sharidas/core,IljaN/core