Merge branch 'master' into ns-modernize-build

package.json

@@ -58,7 +58,7 @@
     "sinon": "1.17.4",
     "source-map-support": "^0.3.2",
     "temp": "0.8.1",
-    "text-buffer": "9.2.3",
+    "text-buffer": "9.2.6",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",
@@ -87,13 +87,13 @@
     "autoflow": "0.27.0",
     "autosave": "0.23.1",
     "background-tips": "0.26.1",
-    "bookmarks": "0.41.0",
+    "bookmarks": "0.41.1",
     "bracket-matcher": "0.82.1",
     "command-palette": "0.38.0",
     "deprecation-cop": "0.54.1",
     "dev-live-reload": "0.47.0",
     "encoding-selector": "0.22.0",
-    "exception-reporting": "0.38.1",
+    "exception-reporting": "0.38.3",
     "find-and-replace": "0.201.0",
     "fuzzy-finder": "1.3.0",
     "git-diff": "1.1.0",