Fix scrolling on touch devices
Merge branch 'bugfix-scrolling-on-touch-devices'

Conflicts:
	CHANGELOG.md