Merge branch 'master' into node-v6

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.87.2",
+  "version": "2.87.6",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -40,7 +40,8 @@
     "turbo-carto": "0.19.0",
     "underscore": "~1.6.0",
     "windshaft": "cartodb/windshaft#mapnik-migration",
-    "yargs": "~5.0.0"
+    "yargs": "~5.0.0",
+    "zipfile": "cartodb/node-zipfile#0.5.11-cdb1"
   },
   "devDependencies": {
     "istanbul": "~0.4.3",