merge with 3.7

src/Buffer.ts

@@ -5,7 +5,7 @@
 
 import { CircularList } from './common/CircularList';
 import { CharData, ITerminal, IBuffer, IBufferLine, IBufferLineConstructor } from './Types';
-import { EventEmitter } from './EventEmitter';
+import { EventEmitter } from './common/EventEmitter';
 import { IMarker } from 'xterm';
 import { BufferLine, BufferLineTypedArray } from './BufferLine';