Merge branch 'master' into mkt-fix-uri-handler-off-by-one-line-error

package.json

@@ -53,7 +53,6 @@
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi-reporters": "^1.1.4",
     "mock-spawn": "^0.2.6",
-    "nan": "2.7.0",
     "normalize-package-data": "^2.0.0",
     "nslog": "^3",
     "oniguruma": "6.2.1",
@@ -71,7 +70,7 @@
     "service-hub": "^0.7.4",
     "sinon": "1.17.4",
     "temp": "^0.8.3",
-    "text-buffer": "13.8.5",
+    "text-buffer": "13.8.6",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",