port of PR #8038
port of PR #8038

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