Fixed bug potentially causing broken sites and solved #4431 along the way.
Fixed bug potentially causing broken sites and solved #4431 along the way.

slbmeh/composer,nicolas-grekas/composer,balbuf/composer,davidolrik/composer,vdm-io/composer,naderman/composer,SpacePossum/composer,stefangr/composer,phansys/composer,floverdevel/composer,yaman-jain/composer,localheinz/composer,fabpot/composer,MoT3rror/composer,milleruk/composer,till/composer,staabm/composer,dzuelke/composer,composer/composer,fabiang/composer,hirak/composer,JBleijenberg/composer,curry684/composer,jreinke/composer,erasys/composer,pierredup/composer,andrerom/composer,johnstevenson/composer,stof/composer,gencer/composer,alcohol/composer,Soullivaneuh/composer,remicollet/composer