Make build work from PHP
Merge remote-tracking branch 'composer/experimental' into experimental