backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6
backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6

xx621998xx/server,nextcloud/server,bluelml/core,pollopolea/core,endsguy/server,pollopolea/core,xx621998xx/server,sharidas/core,IljaN/core,bluelml/core,pollopolea/core,whitekiba/server,owncloud/core,jbicha/server,owncloud/core,owncloud/core,sharidas/core,IljaN/core,endsguy/server,pollopolea/core,andreas-p/nextcloud-server,IljaN/core,pmattern/server,jbicha/server,jbicha/server,xx621998xx/server,xx621998xx/server,andreas-p/nextcloud-server,pixelipo/server,whitekiba/server,Ardinis/server,sharidas/core,andreas-p/nextcloud-server,cernbox/core,pollopolea/core,cernbox/core,owncloud/core,cernbox/core,andreas-p/nextcloud-server,michaelletzgus/nextcloud-server,lrytz/core,endsguy/server,michaelletzgus/nextcloud-server,owncloud/core,michaelletzgus/nextcloud-server,cernbox/core,lrytz/core,jbicha/server,bluelml/core,cernbox/core,pixelipo/server,pmattern/server,pixelipo/server,nextcloud/server,pixelipo/server,pmattern/server,michaelletzgus/nextcloud-server,sharidas/core,phil-davis/core,bluelml/core,bluelml/core,IljaN/core,sharidas/core,Ardinis/server,endsguy/server,whitekiba/server,lrytz/core,Ardinis/server,endsguy/server,whitekiba/server,Ardinis/server,andreas-p/nextcloud-server,nextcloud/server,lrytz/core,xx621998xx/server,IljaN/core,pmattern/server,pmattern/server,pixelipo/server,whitekiba/server,nextcloud/server,jbicha/server,Ardinis/server,lrytz/core