Merge pull request #428 from negativeExponent/libretro