Merge pull request #430 from negativeExponent/libretro