Merge branch 'tty-updates' from Alan