semi-correctly display xterm control sequences
Merge remote-tracking branch 'origin/master'