Merge with origin/master

Author: brianc

NEWS.md

@@ -4,6 +4,9 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### v3.6.0
+- Include support for (parsing JSONB)[https://github.com/brianc/node-pg-types/pull/13] (supported in postgres 9.4)
+
 ### v3.5.0
 - Include support for parsing boolean arrays
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",
@@ -23,8 +23,8 @@
     "nan": "1.3.0",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.3",
-    "pg-native": "1.4.1",
-    "pg-types": "1.5.0",
+    "pg-native": "^1.4.2",
+    "pg-types": "1.6.0",
     "pgpass": "0.0.3"
   },
   "devDependencies": {