Merge branch 'master' into v3.3.0

package.json

@@ -57,7 +57,7 @@
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~1.0.0",
     "npm-shrinkwrap": "~4.0.0",
-    "remarkable": "^1.2.0",
+    "remarkable": "^1.2.2",
     "time-grunt": "~1.0.0"
   },
   "engines": {

test-infra/npm-shrinkwrap.json

@@ -129,10 +129,6 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
           "dependencies": {
-            "colors": {
-              "version": "0.6.2",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-            },
             "lodash": {
               "version": "2.4.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
@@ -145,21 +141,7 @@
         },
         "grunt-legacy-util": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.1.22",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-            },
-            "lodash": {
-              "version": "0.9.2",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
-            },
-            "underscore.string": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
-            }
-          }
+          "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
         },
         "hooker": {
           "version": "0.2.3",
@@ -244,8 +226,8 @@
           "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-3.1.2.tgz",
           "dependencies": {
             "caniuse-db": {
-              "version": "1.0.30000011",
-              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000011.tgz"
+              "version": "1.0.30000014",
+              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000014.tgz"
             },
             "postcss": {
               "version": "2.2.5",
@@ -1172,8 +1154,8 @@
           "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
         },
         "jshint": {
-          "version": "2.5.6",
-          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.6.tgz",
+          "version": "2.5.7",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.7.tgz",
           "dependencies": {
             "cli": {
               "version": "0.6.5",
@@ -1604,8 +1586,8 @@
               "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
             },
             "phantomjs": {
-              "version": "1.9.11",
-              "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.11.tgz",
+              "version": "1.9.12",
+              "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.12.tgz",
               "dependencies": {
                 "adm-zip": {
                   "version": "0.4.4",
@@ -1626,8 +1608,8 @@
                   }
                 },
                 "ncp": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"
                 },
                 "npmconf": {
                   "version": "2.0.9",
@@ -1702,8 +1684,8 @@
                       "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
                       "dependencies": {
                         "readable-stream": {
-                          "version": "1.0.32",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz",
+                          "version": "1.0.33",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                           "dependencies": {
                             "core-util-is": {
                               "version": "1.0.1",
@@ -2151,10 +2133,6 @@
                     }
                   }
                 },
-                "vow": {
-                  "version": "0.4.4",
-                  "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
-                },
                 "vow-fs": {
                   "version": "0.3.2",
                   "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.2.tgz",
@@ -2173,10 +2151,6 @@
                       "version": "1.4.0",
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"
                     },
-                    "vow": {
-                      "version": "0.4.4",
-                      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
-                    },
                     "vow-queue": {
                       "version": "0.3.1",
                       "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz"
@@ -3846,8 +3820,8 @@
       }
     },
     "remarkable": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.2.1.tgz",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.3.0.tgz",
       "dependencies": {
         "argparse": {
           "version": "0.1.15",
@@ -3866,6 +3840,146 @@
         "autolinker": {
           "version": "0.12.3",
           "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.12.3.tgz"
+        },
+        "coveralls": {
+          "version": "2.11.2",
+          "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz",
+          "dependencies": {
+            "js-yaml": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
+              "dependencies": {
+                "esprima": {
+                  "version": "1.0.4",
+                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
+                }
+              }
+            },
+            "lcov-parse": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"
+            },
+            "log-driver": {
+              "version": "1.2.4",
+              "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz"
+            },
+            "request": {
+              "version": "2.40.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+              "dependencies": {
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "form-data": {
+                  "version": "0.1.4",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.9.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                    },
+                    "combined-stream": {
+                      "version": "0.0.5",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                        }
+                      }
+                    },
+                    "mime": {
+                      "version": "1.2.11",
+                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                    }
+                  }
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "boom": {
+                      "version": "0.4.2",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "hoek": {
+                      "version": "0.9.1",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "http-signature": {
+                  "version": "0.10.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+                  "dependencies": {
+                    "asn1": {
+                      "version": "0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "assert-plus": {
+                      "version": "0.1.2",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.2",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.1",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+                },
+                "oauth-sign": {
+                  "version": "0.3.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+                },
+                "qs": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.4",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    }
+                  }
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                }
+              }
+            }
+          }
         }
       }
     },