100,000 screen scrollback lines
Merge branch 'master' into tz-centos