Merge pull request #416 from negativeExponent/libretro