diff --git a/build/monaco/package.json b/build/monaco/package.json
index 7170c3e8b502e..580bf6f6abe8d 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.31.1-os",
+  "version": "0.31.1-os2-cnh-1",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
diff --git a/src/vs/editor/common/modes/languageConfiguration.ts b/src/vs/editor/common/modes/languageConfiguration.ts
index 3c8a5c22b4523..8f23532b34756 100644
--- a/src/vs/editor/common/modes/languageConfiguration.ts
+++ b/src/vs/editor/common/modes/languageConfiguration.ts
@@ -61,7 +61,7 @@ export interface LanguageConfiguration {
 	 * selected string is surrounded by the open and close characters. If not set, the autoclosing pairs
 	 * settings will be used.
 	 */
-	surroundingPairs?: IAutoClosingPair[];
+	surroundingPairs?: IAutoClosingPairConditional[];
 	/**
 	 * Defines a list of bracket pairs that are colorized depending on their nesting level.
 	 * If not set, the configured brackets will be used.
diff --git a/src/vs/editor/common/modes/languageConfigurationRegistry.ts b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
index 704e51f7866b7..bc2665868927a 100644
--- a/src/vs/editor/common/modes/languageConfigurationRegistry.ts
+++ b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
@@ -10,7 +10,18 @@ import { LineTokens } from 'vs/editor/common/core/lineTokens';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { DEFAULT_WORD_REGEXP, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
-import { EnterAction, FoldingRules, IAutoClosingPair, IndentAction, IndentationRule, LanguageConfiguration, CompleteEnterAction, AutoClosingPairs, CharacterPair, ExplicitLanguageConfiguration } from 'vs/editor/common/modes/languageConfiguration';
+import {
+	EnterAction,
+	FoldingRules,
+	IndentAction,
+	IndentationRule,
+	LanguageConfiguration,
+	CompleteEnterAction,
+	AutoClosingPairs,
+	CharacterPair,
+	ExplicitLanguageConfiguration,
+	IAutoClosingPairConditional
+} from 'vs/editor/common/modes/languageConfiguration';
 import { createScopedLineTokens, ScopedLineTokens } from 'vs/editor/common/modes/supports';
 import { CharacterPairSupport } from 'vs/editor/common/modes/supports/characterPair';
 import { BracketElectricCharacterSupport, IElectricAction } from 'vs/editor/common/modes/supports/electricCharacter';
@@ -272,7 +283,7 @@ export class LanguageConfigurationRegistryImpl {
 		return characterPairSupport.getAutoCloseBeforeSet();
 	}
 
-	public getSurroundingPairs(languageId: string): IAutoClosingPair[] {
+	public getSurroundingPairs(languageId: string): IAutoClosingPairConditional[] {
 		let characterPairSupport = this._getCharacterPairSupport(languageId);
 		if (!characterPairSupport) {
 			return [];
diff --git a/src/vs/editor/common/modes/supports/characterPair.ts b/src/vs/editor/common/modes/supports/characterPair.ts
index 61ff98738625b..2508ae7f1b3bf 100644
--- a/src/vs/editor/common/modes/supports/characterPair.ts
+++ b/src/vs/editor/common/modes/supports/characterPair.ts
@@ -3,7 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAutoClosingPair, StandardAutoClosingPairConditional, LanguageConfiguration, CharacterPair } from 'vs/editor/common/modes/languageConfiguration';
+import {
+	StandardAutoClosingPairConditional,
+	LanguageConfiguration,
+	CharacterPair,
+	IAutoClosingPairConditional
+} from 'vs/editor/common/modes/languageConfiguration';
 
 export class CharacterPairSupport {
 
@@ -11,7 +16,7 @@ export class CharacterPairSupport {
 	static readonly DEFAULT_AUTOCLOSE_BEFORE_WHITESPACE = ' \n\t';
 
 	private readonly _autoClosingPairs: StandardAutoClosingPairConditional[];
-	private readonly _surroundingPairs: IAutoClosingPair[];
+	private readonly _surroundingPairs: IAutoClosingPairConditional[];
 	private readonly _autoCloseBefore: string;
 	private readonly _colorizedBracketPairs: CharacterPair[];
 
@@ -57,7 +62,7 @@ export class CharacterPairSupport {
 		return this._autoCloseBefore;
 	}
 
-	public getSurroundingPairs(): IAutoClosingPair[] {
+	public getSurroundingPairs(): IAutoClosingPairConditional[] {
 		return this._surroundingPairs;
 	}