Merge branch 'master' into 553_find_api

author Daniel Imms <tyriar@tyriar.com>

Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)

committer GitHub <noreply@github.com>

Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
author Daniel Imms <tyriar@tyriar.com>
Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
committer GitHub <noreply@github.com>
Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
diff --cc src/SelectionManager.ts
Simple merge
diff --cc src/xterm.js
Simple merge
author	Daniel Imms <tyriar@tyriar.com>
	Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
committer	GitHub <noreply@github.com>
	Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
		1	2
src/SelectionManager.ts	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.js	patch \|	diff1 \|	diff2 \|	blob \| history