Merge branch 'terminal-driver'
Merge branch 'terminal-driver'
Added support for enabling/disabling scrolling.
Merge branch 'master' into terminal-driver