Merge pull request #634 from libretro/revert-633-revert-631-autoframeskip