Merge pull request #576 from gameblabla/cdrom_regression_remove