Merge commit '4738b880a6c29a6d10dda3ad178f35a54bd576d3'

Conflicts:
	NEWS.md
	package.json

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.11.0",
+    "version": "1.11.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.20.0",
+        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.21.0",
         "step": "0.0.x",
         "request": "2.9.202",
         "cartodb-redis": "~0.3.0",