Merge branch 'master' into column-select

src/SelectionManager.ts

@@ -6,7 +6,7 @@
 import { ITerminal, ISelectionManager, IBuffer, CharData, XtermListener } from './Types';
 import { MouseHelper } from './utils/MouseHelper';
 import * as Browser from './shared/utils/Browser';
-import { CharMeasure } from './utils/CharMeasure';
+import { CharMeasure } from './ui/CharMeasure';
 import { EventEmitter } from './EventEmitter';
 import { SelectionModel } from './SelectionModel';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from './Buffer';
@@ -123,6 +123,11 @@ export class SelectionManager extends EventEmitter implements ISelectionManager
     this._columnSelectRequiredModifiers = this._initColumnSelectModifierKeys();
   }
 
+  public dispose(): void {
+    super.dispose();
+    this._removeMouseDownListeners();
+  }
+
   private get _buffer(): IBuffer {
     return this._terminal.buffers.active;
   }