Fix OS X scrolling issue.  Closes #2078.