Merge pull request #442 from negativeExponent/libretro