Merge branch 'release/staging' into develop

NEWS.md

@@ -3,7 +3,8 @@
 
 1.2.1
 ------
-* Require Windshaft-0.12.1 to fix multilayer post from firefox
+* Fix multilayer post from firefox
+* Fix multilayer cartocss layer name handling
 
 1.2.0
 ------

npm-shrinkwrap.json

@@ -193,10 +193,10 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.12.1",
+      "version": "0.12.3",
       "dependencies": {
         "grainstore": {
-          "version": "0.13.0",
+          "version": "0.13.2",
           "dependencies": {
             "carto": {
               "version": "0.9.3-cdb3",

package.json

@@ -21,7 +21,7 @@
         "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.12.1",
+        "windshaft"  : "~0.12.3",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "0.7.2",