Fix boot.php location
Merge branch 'testing' into preinstall