Adding awesome new feature to disallow auto-scrolling when the cursor is not in view
Merge remote-tracking branch 'origin/master'