diff --git a/package.json b/package.json
index 234490b55c..470b3585ea 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "grunt-contrib-jade": "~0.12.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-less": "~0.11.3",
-    "grunt-contrib-qunit": "~0.5.1",
+    "grunt-contrib-qunit": "~0.5.2",
     "grunt-contrib-uglify": "~0.5.0",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-csscomb": "~2.0.1",
@@ -57,7 +57,7 @@
     "load-grunt-tasks": "~0.6.0",
     "markdown": "~0.5.0",
     "npm-shrinkwrap": "~3.1.6",
-    "time-grunt": "~0.3.2"
+    "time-grunt": "~0.4.0"
   },
   "engines": {
     "node": "~0.10.1"
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index 77f90078ff..6ff871c3e1 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -274,8 +274,8 @@
                   "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
                 },
                 "source-map": {
-                  "version": "0.1.34",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                  "version": "0.1.36",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
                   "dependencies": {
                     "amdefine": {
                       "version": "0.1.0",
@@ -714,12 +714,12 @@
           }
         },
         "maxmin": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.1.tgz",
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz",
           "dependencies": {
             "chalk": {
-              "version": "0.5.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz",
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "1.1.0",
@@ -755,6 +755,10 @@
                 }
               }
             },
+            "figures": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/figures/-/figures-1.0.1.tgz"
+            },
             "gzip-size": {
               "version": "0.2.0",
               "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz",
@@ -764,8 +768,8 @@
                   "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
                   "dependencies": {
                     "pako": {
-                      "version": "0.2.3",
-                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.3.tgz"
+                      "version": "0.2.4",
+                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.4.tgz"
                     }
                   }
                 },
@@ -856,12 +860,12 @@
               "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"
             },
             "constantinople": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz",
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz",
               "dependencies": {
                 "uglify-js": {
-                  "version": "2.4.14",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
+                  "version": "2.4.15",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -968,8 +972,8 @@
                       }
                     },
                     "source-map": {
-                      "version": "0.1.34",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                      "version": "0.1.36",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
                       "dependencies": {
                         "amdefine": {
                           "version": "0.1.0",
@@ -986,8 +990,8 @@
               "resolved": "https://registry.npmjs.org/with/-/with-3.0.0.tgz",
               "dependencies": {
                 "uglify-js": {
-                  "version": "2.4.14",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
+                  "version": "2.4.15",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -1082,8 +1086,8 @@
               "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
             },
             "htmlparser2": {
-              "version": "3.7.2",
-              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz",
+              "version": "3.7.3",
+              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.1.1",
@@ -1312,8 +1316,8 @@
               }
             },
             "source-map": {
-              "version": "0.1.34",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+              "version": "0.1.36",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
               "dependencies": {
                 "amdefine": {
                   "version": "0.1.0",
@@ -1402,8 +1406,8 @@
       }
     },
     "grunt-contrib-qunit": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.1.tgz",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.2.tgz",
       "dependencies": {
         "grunt-lib-phantomjs": {
           "version": "0.6.0",
@@ -1414,8 +1418,8 @@
               "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
             },
             "phantomjs": {
-              "version": "1.9.7-12",
-              "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-12.tgz",
+              "version": "1.9.7-14",
+              "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-14.tgz",
               "dependencies": {
                 "adm-zip": {
                   "version": "0.2.1",
@@ -1728,8 +1732,8 @@
           }
         },
         "uglify-js": {
-          "version": "2.4.14",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
+          "version": "2.4.15",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
@@ -2100,8 +2104,8 @@
                           "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz"
                         },
                         "debug": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+                          "version": "1.0.3",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
                           "dependencies": {
                             "ms": {
                               "version": "0.6.2",
@@ -2124,8 +2128,8 @@
                           "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz"
                         },
                         "debug": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+                          "version": "1.0.3",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
                           "dependencies": {
                             "ms": {
                               "version": "0.6.2",
@@ -2160,8 +2164,8 @@
                           "resolved": "https://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz",
                           "dependencies": {
                             "debug": {
-                              "version": "1.0.2",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
+                              "version": "1.0.3",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
                               "dependencies": {
                                 "ms": {
                                   "version": "0.6.2",
@@ -3410,8 +3414,8 @@
                   }
                 },
                 "request": {
-                  "version": "2.36.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+                  "version": "2.37.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.37.0.tgz",
                   "dependencies": {
                     "aws-sign2": {
                       "version": "0.5.0",
@@ -3438,12 +3442,16 @@
                               "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.0.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+                      "version": "1.1.1",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
                       "dependencies": {
                         "boom": {
                           "version": "0.4.2",
@@ -3485,9 +3493,9 @@
                       "version": "5.0.0",
                       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
                     },
-                    "mime": {
-                      "version": "1.2.11",
-                      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                    "mime-types": {
+                      "version": "1.0.1",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.1.tgz"
                     },
                     "node-uuid": {
                       "version": "1.4.1",
@@ -3886,24 +3894,44 @@
       }
     },
     "time-grunt": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.3.2.tgz",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.4.0.tgz",
       "dependencies": {
         "chalk": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"
+              "version": "1.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
-            "has-color": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
+            "escape-string-regexp": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.0.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
             },
             "strip-ansi": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"
+              "version": "0.3.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
@@ -3911,13 +3939,23 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz"
         },
+        "figures": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.0.1.tgz"
+        },
         "hooker": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
         },
         "pretty-ms": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.1.0.tgz"
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz",
+          "dependencies": {
+            "parse-ms": {
+              "version": "0.1.2",
+              "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz"
+            }
+          }
         },
         "text-table": {
           "version": "0.2.0",