Merge branch 'master' into vr-aggregation

NEWS.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.1
+Released 2017-11-29
+
+Announcements:
+ - Upgrades turbo-carto to [0.20.2](https://github.com/CartoDB/turbo-carto/releases/tag/0.20.2).
+
 ## 4.1.0
 Released 2017-mm-dd
 

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -42,7 +42,7 @@
     "semver": "~5.3.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
-    "turbo-carto": "0.20.1",
+    "turbo-carto": "0.20.2",
     "underscore": "~1.6.0",
     "windshaft": "cartodb/windshaft#vr-aggretation",
     "yargs": "~5.0.0"

yarn.lock

@@ -2235,9 +2235,9 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-turbo-carto@0.20.1:
+turbo-carto@0.20.2:
-  version "0.20.1"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/turbo-carto/-/turbo-carto-0.20.1.tgz#e9f5fa1408d9d4325a1e79333e6d242170f89e6d"
+  resolved "https://registry.yarnpkg.com/turbo-carto/-/turbo-carto-0.20.2.tgz#2b737597a65c2918432f70ea414f12fbec2b6a6f"
   dependencies:
     cartocolor "4.0.0"
     colorbrewer "1.0.0"