Merge remote-tracking branch 'ups/master' into 553_find_api

diff --cc demo/index.html
Simple merge

diff --cc gulpfile.js
Simple merge

diff --cc src/SelectionManager.ts
index a99cfa09234751e3f145e649c89519c442a7f7a1,f13549b2ffb764a7b89b5b1c7a82845e9b16d3ec..189d73e826bc5e3e0167835930aac9ee74ae4f9a
--- 1/src/SelectionManager.ts
--- 2/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@@ -179,11 -178,9 +179,12 @@@ export class SelectionManager extends E
     */
    public setBuffer(buffer: CircularList<any>): void {
      this._buffer = buffer;
+     this.clearSelection();
    }
  
 +  public get selectionStart(): [number, number] { return this._model.finalSelectionStart; }
 +  public get selectionEnd(): [number, number] { return this._model.finalSelectionEnd; }
 +
    /**
     * Gets whether there is an active text selection.
     */

diff --cc src/xterm.js
Simple merge