Rebase with chjj/pty.js master