Merge 'origin/master' into decaffeinate-notifications

package.json

@@ -70,7 +70,7 @@
     "service-hub": "^0.7.4",
     "sinon": "1.17.4",
     "temp": "^0.8.3",
-    "text-buffer": "13.2.1",
+    "text-buffer": "13.3.1",
     "typescript-simple": "1.0.0",
     "underscore-plus": "^1.6.6",
     "winreg": "^1.2.1",
@@ -127,7 +127,7 @@
     "snippets": "1.1.4",
     "spell-check": "0.72.2",
     "status-bar": "1.8.13",
-    "styleguide": "0.49.6",
+    "styleguide": "0.49.7",
     "symbols-view": "0.118.0",
     "tabs": "0.107.2",
     "timecop": "0.36.0",
@@ -154,7 +154,7 @@
     "language-mustache": "0.14.1",
     "language-objective-c": "0.15.1",
     "language-perl": "0.37.0",
-    "language-php": "0.41.0",
+    "language-php": "0.42.0",
     "language-property-list": "0.9.1",
     "language-python": "0.45.4",
     "language-ruby": "0.71.3",