Merge branch 'master' into ben/electron-sandbox

test/unit/electron/index.js

@@ -116,7 +116,6 @@ app.on('ready', () => {
 			nodeIntegration: true,
 			webSecurity: false,
 			webviewTag: true,
-			enableWebSQL: false,
 			preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js') // ensure similar environment as VSCode as tests may depend on this
 		}
 	});