Merge pull request #558 from gameblabla/cdrom_fixes_libretro_popo