Fix a scrolling bug with chrome
Merge branch 'fix-scrolling'