Merge pull request #1173 from ZappoMan/bugfixes

Fix FPS stutter on rotating in place