[bugfix] scrollStop
Merge remote-tracking branch 'origin/master'