Merge from vendor branch BSDINSTALLER: