Merge branch 'master' into project-auth-api

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "5.2.2",
+  "version": "5.3.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "body-parser": "^1.18.2",
-    "camshaft": "0.60.0",
+    "camshaft": "0.61.2",
     "cartodb-psql": "0.10.2",
     "cartodb-query-tables": "0.3.0",
     "cartodb-redis": "cartodb/node-cartodb-redis#project-auth-api",
@@ -47,7 +47,7 @@
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.20.2",
     "underscore": "~1.6.0",
-    "windshaft": "4.5.0",
+    "windshaft": "4.5.1",
     "yargs": "~5.0.0"
   },
   "devDependencies": {