Merge "Several tweaks to the install.php script"