Merge branch 'master' into analysis-layers

NEWS.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## 2.26.1
+
+Released 2016-mm-dd
+
+
 ## 2.26.0
 
-Released 2016-mm-dd
+Released 2016-02-24
 
 Announcements:
  - Upgrades windshaft to [1.13.0](https://github.com/CartoDB/Windshaft/releases/tag/1.13.0)

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.26.0",
+  "version": "2.26.1",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.26.0",
+    "version": "2.26.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"