Merge pull request #413 from negativeExponent/libretro