diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5af3e89bb..099954367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 0.6.84 - 29th June, 2018
+
+* [Michal Hruby (@mhr3)](https://github.com/mhr3)
+    * Support to run tests that use the test suites from [stretchr/testify](https://github.com/stretchr/testify) suite using codelens. [PR 1707](https://github.com/Microsoft/vscode-go/pull/1707)
+
+* [Luis GG (@lggomez)](https://github.com/lggomez)
+    * New setting `go.delveConfig` to configure the use of v2 apis from delve to be used when debugging tests as well normal code. [Feature Request 1735](https://github.com/Microsoft/vscode-go/issues/1735) implemented with [PR 1749](https://github.com/Microsoft/vscode-go/pull/1749)
+
+* [Ramya Rao (@ramya-rao-a)](https://github.com/ramya-rao-a)
+    * Option to install/update selected tools required by the Go extension. [Feature Request 1731](https://github.com/Microsoft/vscode-go/issues/1731)
+
+
 ## 0.6.83 - 15th Jun, 2018
 
 * [Luis GG (@lggomez)](https://github.com/lggomez)
diff --git a/Go-latest.vsix b/Go-latest.vsix
index 21d8750b5..cdf97a135 100644
Binary files a/Go-latest.vsix and b/Go-latest.vsix differ
diff --git a/package.json b/package.json
index ed5975555..81bbe7c47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Go",
-"version": "0.6.83",
+"version": "0.6.84",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {
diff --git a/src/goInstallTools.ts b/src/goInstallTools.ts
index c3706812e..89f537f6a 100644
--- a/src/goInstallTools.ts
+++ b/src/goInstallTools.ts
@@ -318,7 +318,7 @@ function installTools(missing: string[]) {
 			if (tool === 'gocode') {
 				closeToolPromise = new Promise<boolean>((innerResolve) => {
 					cp.execFile(getBinPath('gocode'), ['close'], {}, (err, stdout, stderr) => {
-						if (stderr && stderr.indexOf('rpc: can\'t find service Server.')) {
+						if (stderr && stderr.indexOf('rpc: can\'t find service Server.') > -1) {
 							outputChannel.appendLine('Installing gocode aborted as existing process cannot be closed. Please kill the running process for gocode and try again.');
 							return innerResolve(false);
 						}