Merge pull request #424 from negativeExponent/libretro