Merge pull request #145 from libretro/revert-144-master