Fix scrolling behaviour for good (?)
Merge branch 'scrolling' into gh-pages