arrest all scrolling of document and horizontal scrolling of notebook

should fix #715
Merge remote-tracking branch 'upstream/develop' into develop