Merge branch '1668_io_corruption_xterm_nonutf'