Merge pull request #425 from negativeExponent/libretro