remove scrollbars
Merge branch '1.x'