Fix for the slow scrolling bug.
Merge branch 'slow-scrolling' into vim