Merge remote-tracking branch 'ups/master' into pr/joyceerhl/3214

src/browser/public/AddonManager.ts

@@ -31,7 +31,7 @@ export class AddonManager implements IDisposable {
     };
     this._addons.push(loadedAddon);
     instance.dispose = () => this._wrappedAddonDispose(loadedAddon);
-    instance.activate(<any>terminal);
+    instance.activate(terminal as any);
   }
 
   private _wrappedAddonDispose(loadedAddon: ILoadedAddon): void {

src/browser/public/Terminal.ts

@@ -36,6 +36,7 @@ export class Terminal implements ITerminalApi {
   public get onData(): IEvent<string> { return this._core.onData; }
   public get onBinary(): IEvent<string> { return this._core.onBinary; }
   public get onTitleChange(): IEvent<string> { return this._core.onTitleChange; }
+  public get onBell(): IEvent<void> { return this._core.onBell; }
   public get onScroll(): IEvent<number> { return this._core.onScroll; }
   public get onKey(): IEvent<{ key: string, domEvent: KeyboardEvent }> { return this._core.onKey; }
   public get onRender(): IEvent<{ start: number, end: number }> { return this._core.onRender; }