Merge branch 'master' into patch-1

Author: jhnns

package.json

@@ -9,23 +9,23 @@
   },
   "dependencies": {
     "assert": "^1.1.1",
-    "browserify-zlib": "^0.1.4",
+    "browserify-zlib": "^0.2.0",
     "buffer": "^4.3.0",
     "console-browserify": "^1.1.0",
     "constants-browserify": "^1.0.0",
     "crypto-browserify": "^3.11.0",
     "domain-browser": "^1.1.1",
     "events": "^1.0.0",
     "https-browserify": "^1.0.0",
-    "os-browserify": "^0.2.0",
+    "os-browserify": "^0.3.0",
     "path-browserify": "0.0.0",
     "process": "^0.11.0",
     "punycode": "^1.2.4",
     "querystring-es3": "^0.2.0",
     "readable-stream": "^2.0.5",
     "stream-browserify": "^2.0.1",
     "stream-http": "^2.3.1",
-    "string_decoder": "^0.10.25",
+    "string_decoder": "^1.0.0",
     "timers-browserify": "^2.0.2",
     "tty-browserify": "0.0.0",
     "url": "^0.11.0",