Merge pull request #419 from negativeExponent/libretro