Merge pull request #417 from negativeExponent/libretro