Merge pull request #1 from libretro/master