Merge pull request #636 from neonloop/autoframeskip_updates