Merge pull request #1415 from HansMuller/snap_scrolling_tests

Snap scrolling: additional tests, cleanup