fixed bug with 2.3<= systems where the scrollbar handle gets stuck
Merge remote-tracking branch 'origin/master'