diff --git a/NEWS.md b/NEWS.md
index 49b13e06..937a9ab3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,7 @@
 1.3.5
 ------
 
+* Fixing apostrophes in CartoCSS
 * Fix "sql/table must contain zoom variable" error when using
   "[ zoom > 3]" CartoCSS snippets (note the space)
 * Fix backward compatibility handling of sqlapi.host configuration (#82)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 707fc4ab..a5975979 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -9,14 +9,14 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.13.6",
+      "version": "0.13.7",
       "dependencies": {
         "grainstore": {
-          "version": "0.13.10",
+          "version": "0.13.11",
           "dependencies": {
             "carto": {
-              "version": "0.9.3-cdb5",
-              "from": "git://github.com/CartoDB/carto.git#cdb-0.9.3-cdb5",
+              "version": "0.9.3-cdb6",
+              "from": "git://github.com/CartoDB/carto.git#0.9.3-cdb6",
               "dependencies": {
                 "mapnik-reference": {
                   "version": "5.0.0-cdb1",
@@ -33,11 +33,10 @@
               }
             },
             "mapnik-reference": {
-              "version": "5.0.4"
+              "version": "5.0.6"
             },
             "millstone": {
-              "version": "0.6.0-cdb1",
-              "from": "git://github.com/CartoDB/millstone.git#cdb-0.6.0-cdb1",
+              "version": "0.6.5",
               "dependencies": {
                 "underscore": {
                   "version": "1.5.2"
@@ -101,7 +100,7 @@
                       "version": "1.4.1"
                     },
                     "form-data": {
-                      "version": "0.1.1",
+                      "version": "0.1.2",
                       "dependencies": {
                         "combined-stream": {
                           "version": "0.0.4",
@@ -119,10 +118,10 @@
                   }
                 },
                 "srs": {
-                  "version": "0.3.2"
+                  "version": "0.3.3"
                 },
                 "zipfile": {
-                  "version": "0.4.0"
+                  "version": "0.4.1"
                 },
                 "sqlite3": {
                   "version": "2.1.17",
@@ -183,7 +182,7 @@
                       "version": "0.0.2"
                     },
                     "minimist": {
-                      "version": "0.0.2"
+                      "version": "0.0.5"
                     }
                   }
                 }
@@ -234,7 +233,7 @@
           "from": "git://github.com/Vizzuality/tilelive-mapnik.git#5908346",
           "dependencies": {
             "eio": {
-              "version": "0.2.1"
+              "version": "0.2.2"
             },
             "mime": {
               "version": "1.2.11"
diff --git a/package.json b/package.json
index ef81f79d..04b5131d 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "dependencies": {
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.13.6",
+        "windshaft"  : "~0.13.7",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "~0.8.3",
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index 8349ef6a..bd6957c5 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -653,6 +653,35 @@ suite('multilayer', function() {
       });
     });
 
+    test("quotes CartoCSS", function(done) {
+
+      var layergroup =  {
+        version: '1.0.1',
+        layers: [
+           { options: {
+               sql: "select 'single''quote' as n, 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
+               cartocss: '#s [n="single\'quote" ] { marker-fill:red; }',
+               cartocss_version: '2.1.0',
+             } },
+           { options: {
+               sql: "select 'double\"quote' as n, 'SRID=3857;POINT(2 0)'::geometry as the_geom_webmercator",
+               cartocss: '#s [n="double\\"quote" ] { marker-fill:red; }',
+               cartocss_version: '2.1.0',
+             } }
+        ]
+      };
+
+      assert.response(server, {
+          url: '/tiles/layergroup?',
+          method: 'POST',
+          headers: {host: 'localhost', 'Content-Type': 'application/json' },
+          data: JSON.stringify(layergroup)
+      }, {}, function(res) {
+          assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
+          done();
+      });
+    });
+
     suiteTeardown(function(done) {
 
         // This test will add map_style records, like