Pull in changes just made to the BETA 1.1 branch for cd install floppy