Merge pull request #631 from neonloop/autoframeskip