Backport #6312 to 1.4
Backport #6312 to 1.4
nicolas-grekas/composer,alcohol/composer,pierredup/composer,localheinz/composer,fabpot/composer,dzuelke/composer,johnstevenson/composer,naderman/composer,gencer/composer,slbmeh/composer,milleruk/composer,staabm/composer,composer/composer,floverdevel/composer,andrerom/composer,stof/composer,erasys/composer,vdm-io/composer,SpacePossum/composer,stefangr/composer