Bug with multi-line scroll fixed
Merge remote-tracking branch 'origin/master'