Merge branch 'master' into ben/electron-sandbox

src/vs/code/electron-main/window.ts

@@ -166,8 +166,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 					preload: URI.parse(this.doGetPreloadUrl()).fsPath,
 					nodeIntegration: true,
 					nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
-					webviewTag: true,
-					enableWebSQL: false
+					webviewTag: true
 				}
 			};