[pull] master from xtermjs:master#152

pull[bot] merged 2 commits into

code:mastercode/app-xterm.js:masterfrom

xtermjs:masterxtermjs/xterm.js:masterCopy head branch name to clipboard