No scrollbars on code.
Merge master.