Merge branch 'master' into joao/linux-completions

package.json

 {
   "name": "code-oss-dev",
   "version": "1.38.0",
-  "distro": "f123663d79c57c07e3f70b2d0938f1a58ff4d1da",
+  "distro": "4694b56986953df2562df7cc65b4d7806e46c138",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -157,4 +157,4 @@
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"
   }
-}
+}
\ No newline at end of file

src/vs/workbench/browser/web.simpleservices.ts

@@ -728,7 +728,9 @@ export class SimpleWindowsService implements IWindowsService {
 		}
 
 		// add connection token
-		newAddress += `${this.workbenchEnvironmentService.configuration.connectionToken ? `tkn=${this.workbenchEnvironmentService.configuration.connectionToken}` : ''}`;
+		if (this.workbenchEnvironmentService.configuration.connectionToken) {
+			newAddress += `&tkn=${this.workbenchEnvironmentService.configuration.connectionToken}`;
+		}
 
 		window.open(newAddress);