diff --git a/.circleci/config.yml b/.circleci/config.yml
index a8557a817c..c717e0ef7d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ run_log_mem_use: &run_log_mem_use
     # Log memory usage throughout entire build.
     MEMUSELOG=/tmp/memuse.txt /bin/bash -c '\
         while true; do\
-          ps -u $USER -e -o pid,%cpu,%mem,rss:10,vsz:10,command:20 \
+          ps -e -o user,%cpu,%mem,rss:10,vsz:10,command:20 \
             --sort=-%mem >> $MEMUSELOG; \
           echo "----------" >> $MEMUSELOG; \
           sleep 1; \
@@ -86,11 +86,7 @@ build_machine_environment: &build_machine_environment
     # These will be evaled before each command.
     PRE_TEST_COMMANDS: |-
         ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit.
-        ulimit -n 4096; # CircleCI default is soft 1024, hard 4096. Take it all.
-
-    # Enable the Garbage Collection `gc` object to be exposed so we can try
-    # to our own, hopefully more graceful, technique.
-    TOOL_NODE_FLAGS: --expose-gc
+        ulimit -a # Display all ulimit settings for transparency.
 
     # This is only to make Meteor self-test not remind us that we can set
     # this argument for self-tests.
@@ -115,22 +111,25 @@ jobs:
           command: (git submodule sync && git submodule update --init --recursive) || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init --recursive)
       - restore_cache:
           keys:
-            - dev-bundle-cache-{{ checksum "meteor" }}
-            - dev-bundle-cache
+            - v1-dev-bundle-cache-{{ checksum "meteor" }}
+            - v1-dev-bundle-cache-
       - restore_cache:
           keys:
-            - other-deps-cache-{{ .Branch }}-{{ .Revision }}
-            - other-deps-cache-{{ .Branch }}
-            - other-deps-cache
+            - v2-other-deps-cache-{{ .Branch }}-{{ .Revision }}
+            - v2-other-deps-cache-{{ .Branch }}-
       - restore_cache:
           keys: 
-            - test-groups-v1-{{ .Branch }}
-            - test-groups-v1
+            - v1-test-groups-{{ .Branch }}
+            - v1-test-groups-
       - run:
           name: Create Test Results Directory
           command: |
             sudo mkdir -p ./tmp/results/junit
             sudo chmod a+rwx ./tmp/results/junit
+      # Clear dev_bundle/.npm to ensure consistent test runs.
+      - run:
+          name: Clear npm cache
+          command: ./meteor npm cache clear --force
       - run:
           name: Get Ready
           command: |
@@ -138,10 +137,6 @@ jobs:
             ./meteor --get-ready
           # shouldn't take longer than 20 minutes
           no_output_timeout: 20m
-      # Clear dev_bundle/.npm to ensure consistent test runs.
-      - run:
-          name: Clear npm cache
-          command: ./meteor npm cache clear --force
       - run:
           <<: *run_save_node_bin
       - persist_to_workspace:
@@ -688,16 +683,16 @@ jobs:
             npm install --prefix ./scripts/test-balancer
             npm start --prefix ./scripts/test-balancer --num-groups ${NUM_GROUPS} --running-avg-length ${RUNNING_AVG_LENGTH}
       - save_cache:
-          key: test-groups-v1-{{ .Branch }}-{{ .BuildNum }}
+          key: v1-test-groups-{{ .Branch }}-{{ .BuildNum }}
           paths:
             - ./tmp/test-groups
           when: on_success
       - save_cache:
-          key: dev-bundle-cache-{{ checksum "meteor" }}
+          key: v1-dev-bundle-cache-{{ checksum "meteor" }}
           paths:
             - "dev_bundle"
       - save_cache:
-          key: other-deps-cache-{{ .Branch }}-{{ .Revision }}
+          key: v2-other-deps-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - ".babel-cache"
             - ".meteor"
diff --git a/History.md b/History.md
index 5de633bb65..09664f6c17 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,143 @@
 ## v.NEXT
 
+## v1.7.0.3, 2018-06-13
+
+* Fixed [Issue #9991](https://github.com/meteor/meteor/issues/9991),
+  introduced in
+  [Meteor 1.7.0.2](https://github.com/meteor/meteor/pull/9990)
+  by [PR #9977](https://github.com/meteor/meteor/pull/9977).
+
+## v1.7.0.2, 2018-06-13
+
+* Node has been updated to version
+  [8.11.3](https://nodejs.org/en/blog/release/v8.11.3/), an important
+  [security release](https://nodejs.org/en/blog/vulnerability/june-2018-security-releases/).
+
+* The `meteor-babel` npm package has been updated to version
+  [7.0.0-beta.51](https://github.com/babel/babel/releases/tag/v7.0.0-beta.51).
+
+* Meteor apps created with `meteor create` or `meteor create --minimal`
+  will now have a directory called `tests/` rather than `test/`, so that
+  test code will not be eagerly loaded if you decide to remove the
+  `meteor.mainModule` configuration from `package.json`, thanks to
+  [PR #9977](https://github.com/meteor/meteor/pull/9977) by
+  [@robfallows](https://github.com/robfallows).
+  [Issue #9961](https://github.com/meteor/meteor/issues/9961)
+
+## v1.7.0.1, 2018-05-29
+
+* Reverted an [optimization](https://github.com/meteor/meteor/pull/9825)
+  introduced in Meteor 1.7 to stop scanning `node_modules` for files that
+  might be of interest to compiler plugins, since the intended workarounds
+  (creating symlinks) did not satisfy all existing use cases. We will
+  revisit this optimization in Meteor 1.7.1.
+  [mozfet/meteor-autoform-materialize#43](https://github.com/mozfet/meteor-autoform-materialize/issues/43)
+
+* After updating to Meteor 1.7 or 1.7.0.1, you should update the
+  `@babel/runtime` npm package (as well as other Babel-related packages)
+  to their latest versions, along with the `meteor-node-stubs` package,
+  by running the following command:
+  ```sh
+  meteor npm install @babel/runtime@latest meteor-node-stubs@latest
+  ```
+
+## v1.7, 2018-05-28
+
+* More than 80% of internet users worldwide have access to a web browser
+  that natively supports the latest ECMAScript features and keeps itself
+  updated automatically, which means new features become available almost
+  as soon as they ship. In other words, the future we envisioned when we
+  first began [compiling code with
+  Babel](https://blog.meteor.com/how-much-does-ecmascript-2015-cost-2ded41d70914)
+  is finally here, yet most web frameworks and applications still compile
+  a single client-side JavaScript bundle that must function simultaneously
+  in the oldest and the newest browsers the application developer wishes
+  to support.
+
+  That choice is understandable, because the alternative is daunting: not
+  only must you build multiple JavaScript and CSS bundles for different
+  browsers, with different dependency graphs and compilation rules and
+  webpack configurations, but your server must also be able to detect the
+  capabilities of each visiting client, so that it can deliver the
+  appropriate assets at runtime. Testing a matrix of different browsers
+  and application versions gets cumbersome quickly, so it's no surprise
+  that responsible web developers would rather ship a single, well-tested
+  bundle, and forget about taking advantage of modern features until
+  legacy browsers have disappeared completely.
+
+  With Meteor 1.7, this awkward balancing act is no longer necessary,
+  because Meteor now automatically builds two sets of client-side assets,
+  one tailored to the capabilities of modern browsers, and the other
+  designed to work in all supported browsers, thus keeping legacy browsers
+  working exactly as they did before. Best of all, the entire Meteor
+  community relies on the same system, so any bugs or differences in
+  behavior can be identified and fixed quickly.
+
+  In this system, a "modern" browser can be loosely defined as one with
+  full native support for `async` functions and `await` expressions, which
+  includes more than 80% of the world market, and 85% of the US market
+  ([source](https://caniuse.com/#feat=async-functions)). This standard may
+  seem extremely strict, since `async`/`await` was [just finalized in
+  ECMAScript 2017](http://2ality.com/2016/10/async-function-tips.html),
+  but the statistics clearly justify it. As another example, any modern
+  browser can handle native `class` syntax, though newer syntax like class
+  fields may still need to be compiled for now, whereas a legacy browser
+  will need compilation for both advanced and basic `class` syntax. And of
+  course you can safely assume that any modern browser has a native
+  `Promise` implementation, because `async` functions must return
+  `Promise`s. The list goes on and on.
+
+  This boundary between modern and legacy browsers is designed to be tuned
+  over time, not only by the Meteor framework itself but also by each
+  individual Meteor application. For example, here's how the minimum
+  versions for native ECMAScript `class` support might be expressed:
+
+  ```js
+  import { setMinimumBrowserVersions } from "meteor/modern-browsers";
+
+  setMinimumBrowserVersions({
+    chrome: 49,
+    firefox: 45,
+    edge: 12,
+    ie: Infinity, // Sorry, IE11.
+    mobile_safari: [9, 2], // 9.2.0+
+    opera: 36,
+    safari: 9,
+    electron: 1,
+  }, "classes");
+  ```
+
+  The minimum modern version for each browser is simply the maximum of all
+  versions passed to `setMinimumBrowserVersions` for that browser. The
+  Meteor development server decides which assets to deliver to each client
+  based on the `User-Agent` string of the HTTP request. In production,
+  different bundles are named with unique hashes, which prevents cache
+  collisions, though Meteor also sets the `Vary: User-Agent` HTTP response
+  header to let well-behaved clients know they should cache modern and
+  legacy resources separately.
+
+  For the most part, the modern/legacy system will transparently determine
+  how your code is compiled, bundled, and delivered&mdash;and yes, it
+  works with every existing part of Meteor, including dynamic `import()`
+  and even [the old `appcache`
+  package](https://github.com/meteor/meteor/pull/9776). However, if you're
+  writing dynamic code that depends on modern features, you can use the
+  boolean `Meteor.isModern` flag to detect the status of the current
+  environment (Node 8 is modern, too, of course). If you're writing a
+  Meteor package, you can call `api.addFiles(files, "legacy")` in your
+  `package.js` configuration file to add extra files to the legacy bundle,
+  or `api.addFiles(files, "client")` to add files to all client bundles,
+  or `api.addFiles(files, "web.browser")` to add files only to the modern
+  bundle, and the same rules apply to `api.mainModule`. Just be sure to
+  call `setMinimumBrowserVersions` (in server startup code) to enforce
+  your assumptions about ECMAScript feature support.
+
+  We think this modern/legacy system is one of the most powerful features
+  we've added since we first introduced the `ecmascript` package in Meteor
+  1.2, and we look forward to other frameworks attempting to catch up.
+
+  [PR #9439](https://github.com/meteor/meteor/pull/9439)
+
 * Although Meteor does not recompile packages installed in `node_modules`
   by default, compilation of specific npm packages (for example, to
   support older browsers that the package author neglected) can now be
@@ -20,7 +158,7 @@
     import("the-package").then(...)
     ```
     This reuse of compiled code is the critical new feature that was added
-    in Meteor 1.6.2.
+    in Meteor 1.7.
 
   * Install the package normally with `meteor npm install the-package`,
     then create a symbolic link *to* the installed package elsewhere in
@@ -44,7 +182,22 @@
   application code. [PR #9771](https://github.com/meteor/meteor/pull/9771)
   [Feature #6](https://github.com/meteor/meteor-feature-requests/issues/6)
 
-* The `npm` package has been upgraded to version 5.8.0, and our
+  > ~Note: since compilation of npm packages can now be enabled using the
+    techniques described above, Meteor will no longer automatically scan
+    `node_modules` directories for modules that can be compiled by
+    compiler plugins. If you have been using that functionality to import
+    compiled-to-JS modules from `node_modules`, you should start using the
+    symlinking strategy instead.~ **Follow-up note: this optimization was
+    reverted in Meteor 1.7.0.1 (see [above](#v1701-2018-05-29)).**
+
+* Node has been updated to version
+  [8.11.2](https://nodejs.org/en/blog/release/v8.11.2/), officially fixing
+  a [cause](https://github.com/nodejs/node/issues/19274) of frequent
+  segmentation faults in Meteor applications that was introduced in Node
+  8.10.0. Meteor 1.6.1.1 shipped with a custom build of Node that patched
+  this problem, but that approach was never intended to be permanent.
+
+* The `npm` package has been upgraded to version 5.10.0, and our
   [fork](https://github.com/meteor/pacote/tree/v7.6.1-meteor) of its
   `pacote` dependency has been rebased against version 7.6.1.
 
@@ -101,12 +254,32 @@
   test files across your codebase; just make sure you import the ones you
   want to run. [PR #9714](https://github.com/meteor/meteor/pull/9714)
 
+* The `meteor create` command now supports a `--minimal` option, which
+  creates an app with as few Meteor packages as possible, in order to
+  minimize client bundle size while still demonstrating advanced features
+  such as server-side rendering. This starter application is a solid
+  foundation for any application that doesn't need Mongo or DDP.
+
 * The `meteor-babel` npm package has been updated to version
-  7.0.0-beta.46.
+  7.0.0-beta.49-1. Note: while Babel has recently implemented support for
+  a new kind of `babel.config.js` configuration file (see [this
+  PR](https://github.com/babel/babel/pull/7358)), and future versions of
+  Meteor will no doubt embrace this functionality, Meteor 1.7 supports
+  only `.babelrc` files as a means of customizing the default Babel
+  configuration provided by Meteor. In other words, if your project
+  contains a `babel.config.js` file, it will be ignored by Meteor 1.7.
 
-* The `reify` npm package has been updated to version 0.15.1.
+* The `reify` npm package has been updated to version 0.16.2.
 
-* The `optimism` npm package has been updated to version 0.4.0.
+* The `meteor-node-stubs` package, which provides stub implementations for
+  any Node built-in modules used by the client (such as `path` and
+  `http`), has a new minor version (0.4.1) that may help with Windows
+  installation problems. To install the new version, run
+  ```sh
+  meteor npm install meteor-node-stubs@latest
+  ```
+
+* The `optimism` npm package has been updated to version 0.6.3.
 
 * The `minifier-js` package has been updated to use `uglify-es` 3.3.9.
 
@@ -115,10 +288,10 @@
   `selftest.skip.define('some test', ...` will skip running "some test".
   [PR #9579](https://github.com/meteor/meteor/pull/9579)
 
-* Mongo has been upgraded to version 3.6.3 for 64-bit systems, and 3.2.19
+* Mongo has been upgraded to version 3.6.4 for 64-bit systems, and 3.2.19
   for 32-bit systems. [PR #9632](https://github.com/meteor/meteor/pull/9632)
 
-  **NOTE:** After upgrading an application to use Mongo 3.6.2, it has been
+  **NOTE:** After upgrading an application to use Mongo 3.6.4, it has been
   observed ([#9591](https://github.com/meteor/meteor/issues/9591))
   that attempting to run that application with an older version of
   Meteor (via `meteor --release X`), that uses an older version of Mongo, can
@@ -132,10 +305,20 @@
   ```
   [PR #9632](https://github.com/meteor/meteor/pull/9632)
 
+* The `mongodb` driver package has been updated from version 2.2.34 to
+  version 3.0.7. [PR #9790](https://github.com/meteor/meteor/pull/9790)
+  [PR #9831](https://github.com/meteor/meteor/pull/9831)
+  [Feature #268](https://github.com/meteor/meteor-feature-requests/issues/268)
+
 * The `cordova-plugin-meteor-webapp` package depended on by the Meteor
   `webapp` package has been updated to version 1.6.0.
   [PR #9761](https://github.com/meteor/meteor/pull/9761)
 
+* Any settings read from a JSON file passed with the `--settings` option
+  during Cordova run/build/deploy will be exposed in `mobile-config.js`
+  via the `App.settings` property, similar to `Meteor.settings`.
+  [PR #9873](https://github.com/meteor/meteor/pull/9873)
+
 * The `@babel/plugin-proposal-class-properties` plugin provided by
   `meteor-babel` now runs with the `loose:true` option, as required by
   other (optional) plugins like `@babel/plugin-proposal-decorators`.
@@ -175,6 +358,15 @@
   [Feature #24](https://github.com/meteor/meteor-feature-requests/issues/24)
   [PR #9657](https://github.com/meteor/meteor/pull/9657)
 
+## v1.6.1.2, 2018-05-28
+
+* Meteor 1.6.1.2 is a very small release intended to fix
+  [#9863](https://github.com/meteor/meteor/issues/9863) by making
+  [#9887](https://github.com/meteor/meteor/pull/9887) available to Windows
+  users without forcing them to update to Meteor 1.7 (yet). Thanks very
+  much to [@zodern](https://github.com/zodern) for identifying a solution
+  to this problem. [PR #9910](https://github.com/meteor/meteor/pull/9910)
+
 ## v1.6.1.1, 2018-04-02
 
 * Node has been updated to version
diff --git a/meteor b/meteor
index 43eb116bad..206e12b0cc 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=8.11.1.2
+BUNDLE_VERSION=8.11.3.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
@@ -133,6 +133,6 @@ fi
 # screw up their meteor installs by have a ~/node_modules
 
 exec "$DEV_BUNDLE/bin/node" \
-     --expose-gc \
+     --max-old-space-size=4096 \
      ${TOOL_NODE_FLAGS} \
      "$METEOR" "$@"
diff --git a/meteor.bat b/meteor.bat
index 4487a471a6..6ea71fbe56 100644
--- a/meteor.bat
+++ b/meteor.bat
@@ -46,7 +46,10 @@ IF EXIST "%~dp0\.git" (
 SET NODE_PATH=%~dp0\dev_bundle\lib\node_modules
 SET BABEL_CACHE_DIR=%~dp0\.babel-cache
 
-"%~dp0\dev_bundle\bin\node.exe" %TOOL_NODE_FLAGS% "%~dp0\tools\index.js" %*
+"%~dp0\dev_bundle\bin\node.exe" ^
+  %TOOL_NODE_FLAGS% ^
+  "%~dp0\tools\index.js" %*
+
 ENDLOCAL
 
 EXIT /b %ERRORLEVEL%
diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index 2bf0aade74..be5483feed 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -192,7 +192,11 @@ CollectionPrototype._defineMutationMethods = function(options) {
             throw new Meteor.Error(403, "Access denied");
           }
         } catch (e) {
-          if (e.name === 'MongoError' || e.name === 'MinimongoError') {
+          if (
+            e.name === 'MongoError' ||
+            e.name === 'BulkWriteError' ||
+            e.name === 'MinimongoError'
+          ) {
             throw new Meteor.Error(409, e.toString());
           } else {
             throw e;
diff --git a/packages/appcache/appcache-server.js b/packages/appcache/appcache-server.js
index 13596e39a4..f0b6957e71 100644
--- a/packages/appcache/appcache-server.js
+++ b/packages/appcache/appcache-server.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor'
+import { isModern } from "meteor/modern-browsers";
+import { WebApp } from "meteor/webapp";
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
@@ -37,12 +39,14 @@ Meteor.AppCache = {
 
 const browserDisabled = request => disabledBrowsers[request.browser.name];
 
-const isDynamic = resource =>
+// Cache of previously computed app.manifest files.
+const manifestCache = new Map;
+
+const shouldSkip = resource =>
   resource.type === 'dynamic js' ||
     (resource.type === 'json' &&
-     // TODO Update this test with PR #9439.
-     resource.url.startsWith('/dynamic/') &&
-     resource.url.endsWith('.map'));
+     (resource.url.endsWith('.map') ||
+      resource.url.endsWith('.stats.json?meteor_js_resource=true')));
 
 WebApp.addHtmlAttributeHook(request =>
   browserDisabled(request) ?
@@ -55,6 +59,8 @@ WebApp.connectHandlers.use((req, res, next) => {
     return next();
   }
 
+  const request = WebApp.categorizeRequest(req);
+
   // Browsers will get confused if we unconditionally serve the
   // manifest and then disable the app cache for that browser.  If
   // the app cache had previously been enabled for a browser, it
@@ -65,12 +71,44 @@ WebApp.connectHandlers.use((req, res, next) => {
   // use").  Returning a 404 gets the browser to really turn off the
   // app cache.
 
-  if (browserDisabled(WebApp.categorizeRequest(req))) {
+  if (browserDisabled(request)) {
     res.writeHead(404);
     res.end();
     return;
   }
 
+  const cacheInfo = {
+    modern: isModern(request.browser),
+  };
+
+  cacheInfo.arch = cacheInfo.modern
+    ? "web.browser"
+    : "web.browser.legacy";
+
+  cacheInfo.clientHash = WebApp.clientHash(cacheInfo.arch);
+
+  if (Package.autoupdate) {
+    const version = Package.autoupdate.Autoupdate.autoupdateVersion;
+    if (version !== cacheInfo.clientHash) {
+      cacheInfo.autoupdateVersion = version;
+    }
+  }
+
+  const cacheKey = JSON.stringify(cacheInfo);
+
+  if (! manifestCache.has(cacheKey)) {
+    manifestCache.set(cacheKey, computeManifest(cacheInfo));
+  }
+
+  const manifest = manifestCache.get(cacheKey);
+
+  res.setHeader('Content-Type', 'text/cache-manifest');
+  res.setHeader('Content-Length', manifest.length);
+
+  return res.end(manifest);
+});
+
+function computeManifest(cacheInfo) {
   let manifest = "CACHE MANIFEST\n\n";
 
   // After the browser has downloaded the app files from the server and
@@ -80,61 +118,82 @@ WebApp.connectHandlers.use((req, res, next) => {
   //
   // So to ensure that the client updates if client resources change,
   // include a hash of client resources in the manifest.
-
-  manifest += `# ${WebApp.clientHash()}\n`;
+  manifest += `# ${cacheInfo.clientHash}\n`;
 
   // When using the autoupdate package, also include
   // AUTOUPDATE_VERSION.  Otherwise the client will get into an
   // infinite loop of reloads when the browser doesn't fetch the new
   // app HTML which contains the new version, and autoupdate will
   // reload again trying to get the new code.
-
-  if (Package.autoupdate) {
-    const version = Package.autoupdate.Autoupdate.autoupdateVersion;
-    if (version !== WebApp.clientHash())
-      manifest += `# ${version}\n`;
+  if (cacheInfo.autoupdateVersion) {
+    manifest += `# ${cacheInfo.autoupdateVersion}\n`;
   }
 
   manifest += "\n";
 
   manifest += "CACHE:\n";
   manifest += "/\n";
-  WebApp.clientPrograms[WebApp.defaultArch].manifest.forEach(resource => {
-    if (resource.where === 'client' &&
-        ! RoutePolicy.classify(resource.url) &&
-        ! isDynamic(resource)) {
-      manifest += resource.url;
-      // If the resource is not already cacheable (has a query
-      // parameter, presumably with a hash or version of some sort),
-      // put a version with a hash in the cache.
-      //
-      // Avoid putting a non-cacheable asset into the cache, otherwise
-      // the user can't modify the asset until the cache headers
-      // expire.
-      if (!resource.cacheable)
-        manifest += `?${resource.hash}`;
 
-      manifest += "\n";
+  eachResource(cacheInfo, resource => {
+    const { url } = resource;
+
+    if (resource.where !== 'client' ||
+        RoutePolicy.classify(url) ||
+        shouldSkip(resource)) {
+      return;
     }
+
+    manifest += url;
+
+    // If the resource is not already cacheable (has a query parameter,
+    // presumably with a hash or version of some sort), put a version with
+    // a hash in the cache.
+    //
+    // Avoid putting a non-cacheable asset into the cache, otherwise the
+    // user can't modify the asset until the cache headers expire.
+    if (! resource.cacheable) {
+      manifest += `?${resource.hash}`;
+    }
+
+    manifest += "\n";
   });
   manifest += "\n";
 
   manifest += "FALLBACK:\n";
   manifest += "/ /\n";
-  // Add a fallback entry for each uncacheable asset we added above.
-  //
-  // This means requests for the bare url ("/image.png" instead of
-  // "/image.png?hash") will work offline. Online, however, the browser
-  // will send a request to the server. Users can remove this extra
-  // request to the server and have the asset served from cache by
-  // specifying the full URL with hash in their code (manually, with
-  // some sort of URL rewriting helper)
-  WebApp.clientPrograms[WebApp.defaultArch].manifest.forEach(resource => {
-    if (resource.where === 'client' &&
-        ! RoutePolicy.classify(resource.url) &&
-        ! resource.cacheable &&
-        ! isDynamic(resource)) {
-      manifest += `${resource.url} ${resource.url}?${resource.hash}\n`;
+  eachResource(cacheInfo, (resource, arch, prefix) => {
+    const { url } = resource;
+
+    if (resource.where !== 'client' ||
+        RoutePolicy.classify(url) ||
+        shouldSkip(resource)) {
+      return;
+    }
+
+    if (! resource.cacheable) {
+      // Add a fallback entry for each uncacheable asset we added above.
+      //
+      // This means requests for the bare url ("/image.png" instead of
+      // "/image.png?hash") will work offline. Online, however, the
+      // browser will send a request to the server. Users can remove this
+      // extra request to the server and have the asset served from cache
+      // by specifying the full URL with hash in their code (manually,
+      // with some sort of URL rewriting helper)
+      manifest += `${url} ${url}?${resource.hash}\n`;
+    }
+
+    if (resource.type === 'asset' &&
+        prefix.length > 0 &&
+        url.startsWith(prefix)) {
+      // If the URL has a prefix like /__browser.legacy or /__cordova, add
+      // a fallback from the un-prefixed URL to the fully prefixed URL, so
+      // that legacy/cordova browsers can load assets offline without
+      // using an explicit prefix. When the client is online, these assets
+      // will simply come from the modern web.browser bundle, which does
+      // not prefix its asset URLs. Using a fallback rather than just
+      // duplicating the resources in the manifest is important because of
+      // appcache size limits.
+      manifest += `${url.slice(prefix.length)} ${url}?${resource.hash}\n`;
     }
   });
 
@@ -151,38 +210,61 @@ WebApp.connectHandlers.use((req, res, next) => {
   manifest += "*\n";
 
   // content length needs to be based on bytes
-  const body = Buffer.from(manifest);
+  return Buffer.from(manifest, "utf8");
+}
 
-  res.setHeader('Content-Type', 'text/cache-manifest');
-  res.setHeader('Content-Length', body.length);
-  return res.end(body);
-});
+function eachResource({
+  modern,
+  arch,
+}, callback) {
+  const manifest = WebApp.clientPrograms[arch].manifest;
 
-const sizeCheck = () => {
-  let totalSize = 0;
-  WebApp.clientPrograms[WebApp.defaultArch].manifest.forEach(resource => {
-    if (resource.where === 'client' &&
-        ! RoutePolicy.classify(resource.url) &&
-        ! isDynamic(resource)) {
-      totalSize += resource.size;
+  let prefix = "";
+  if (! modern) {
+    manifest.some(({ url }) => {
+      if (url && url.startsWith("/__")) {
+        prefix = url.split("/", 2).join("/");
+        return true;
+      }
+    });
+  }
+
+  manifest.forEach(resource => {
+    callback(resource, arch, prefix);
+  });
+}
+
+function sizeCheck() {
+  [ // Check size of each known architecture independently.
+    "web.browser",
+    "web.browser.legacy",
+  ].forEach(arch => {
+    let totalSize = 0;
+
+    WebApp.clientPrograms[arch].manifest.forEach(resource => {
+      if (resource.where === 'client' &&
+          ! RoutePolicy.classify(resource.url) &&
+          ! shouldSkip(resource)) {
+        totalSize += resource.size;
+      }
+    });
+
+    if (totalSize > 5 * 1024 * 1024) {
+      Meteor._debug([
+        "** You are using the appcache package but the total size of the",
+        `** cached resources is ${(totalSize / 1024 / 1024).toFixed(1)}MB.`,
+        "**",
+        "** This is over the recommended maximum of 5MB and may break your",
+        "** app in some browsers! See http://docs.meteor.com/#appcache",
+        "** for more information and fixes."
+      ].join("\n"));
     }
   });
-  if (totalSize > 5 * 1024 * 1024) {
-    Meteor._debug(
-      "** You are using the appcache package but the total size of the\n" +
-      "** cached resources is " +
-      `${(totalSize / 1024 / 1024).toFixed(1)}MB.\n` +
-      "**\n" +
-      "** This is over the recommended maximum of 5 MB and may break your\n" +
-      "** app in some browsers! See http://docs.meteor.com/#appcache\n" +
-      "** for more information and fixes.\n"
-    );
-  }
-};
+}
 
 // Run the size check after user code has had a chance to run. That way,
 // the size check can take into account files that the user does not
 // want cached. Otherwise, the size check warning will still print even
 // if the user excludes their large files with
 // `Meteor.AppCache.config({onlineOnly: files})`.
-Meteor.startup(() => ! _disableSizeCheck ? sizeCheck() : null);
+Meteor.startup(() => _disableSizeCheck || sizeCheck());
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 8874cc2fe3..17aaa0cdd3 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.1.2",
+  version: "1.2.0",
 });
 
 Package.onUse(api => {
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index ac4aa8dfe1..f20eec836b 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -2,339 +2,344 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz",
-      "integrity": "sha512-7BKRkmYaPZm3Yff5HGZJKCz7RqZ5jUjknsXT6Gz5YKG23J3uq9hAj0epncCB0rlqmnZ8Q+UUpQB2tCR5mT37vw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz",
+      "integrity": "sha1-vXHZsZKvl435FYKdOdQJRFZDmgw="
     },
     "@babel/core": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.46.tgz",
-      "integrity": "sha512-lCDbBSAhNAt+nL98xbgWmuhgrIxKvbvFHf73zlNCuXCHJkdlo7qzTofYK0ZWb+OVce8fQ17fC7DwTIhAwowzMw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.51.tgz",
+      "integrity": "sha1-DlS9a2OHNrKuWTwxpH8JaeKyuW0="
     },
     "@babel/generator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-5VfaEVkPG0gpNSTcf70jvV+MjbMoNn4g2iluwM7MhciedkolEtmG7PcdoUj5W1EmMfngz5cF65V7UMZXJO6y8Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.51.tgz",
+      "integrity": "sha1-bHV1/952HQdIXgS67cA5LG2eMPY="
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.46.tgz",
-      "integrity": "sha512-ej5W347ghJF1p2TM3VcEyds1+o1uy1apaQcHrYFJPus2xCgn5KkHPkBGf+6euLfFaQDtB+eWPVKjiZx/hpYXvA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.51.tgz",
+      "integrity": "sha1-OM95IL9fM4oif3VOKGtvut7gS1g="
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.46.tgz",
-      "integrity": "sha512-ZCQ62KqFC5R3NPe5ug9pVqIHYJNup8UdEbE4IXw+s7zr4D/7AsKSt3pXA+FbML5AnQXeCSOuUWioggGmKuDV5g=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.51.tgz",
+      "integrity": "sha1-ITP//j4vcVkeQhR7lHKRyirTkjc="
     },
     "@babel/helper-builder-react-jsx": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.46.tgz",
-      "integrity": "sha512-4xakEEfimusXNgpSY6rP7robwRcnv1E8OxjkYSfsZCYsomFwN7RXU5S29vGWzxE37Yua4yTFqBwId9lwF84Hzw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.51.tgz",
+      "integrity": "sha1-hsctZoO9JZfJOKEhU6bkgL8UASg="
     },
     "@babel/helper-call-delegate": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.46.tgz",
-      "integrity": "sha512-7nhBu/MBlpvZLQsmw/C7VxN14wph+yp+1yxzPEd2oTsHg3oA73tHyguQ6wbtkw+9f1AZtP7ZJCLQ+nGLprF4Fw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.51.tgz",
+      "integrity": "sha1-BO1yfJfPBbyy/WRINzMasV1jyBk="
     },
     "@babel/helper-define-map": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.46.tgz",
-      "integrity": "sha512-rhi59ZVj+bhrgxqLi9VQmQOadcK9rLCArY8zqyjPNjDIsCurCwtQztRWhlz6CwBEhE9FO/KbSa9OFQm7Kobk+w=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.51.tgz",
+      "integrity": "sha1-2Ixkc36UjHE/nxFTM46EFf7kCxE="
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.46.tgz",
-      "integrity": "sha512-SW1OUmx2fC2SqL7+vF1N72FITbPuEWGdr/Gm7I3Vqs8p8T1dfGwB9YFsD+tTpfagKXVMiCCuQ06+G0FB8uxg6Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.51.tgz",
+      "integrity": "sha1-mHUzKti11cmC+kgcuCtzFwPyzS0="
     },
     "@babel/helper-function-name": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz",
-      "integrity": "sha512-zm4Kc5XB2njGs8PkmjV1zE/g1hBuphbh+VcDyFLaQsxkxSFSUtCbKwFL8AQpL/qPIcGbvX1MBt50a/3ZZH2CQA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz",
+      "integrity": "sha1-IbSHSiJ8+Z7K/MMKkDAtpaJkBWE="
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz",
-      "integrity": "sha512-dPrTb7QHVx44xJLjUl3LGAc13iS7hdXdO0fiOxdRN1suIS91yGGgeuwiQBlrw5SxbFchYtwenhlKbqHdVfGyVA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz",
+      "integrity": "sha1-MoGy0EWvlcFyzpGyCCXYXqRnZBE="
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.46.tgz",
-      "integrity": "sha512-9xDHLfaVA445mcHU2OEPwEddiyS0Zxao2WObFR2L/SK5MNOPj2VqVCvivYrO2OpzhnLLCTbOfXRmrwrc9WYN6Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.51.tgz",
+      "integrity": "sha1-XX68hZZWe2RPyYmRLDo++YvgWPw="
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-Xb5iVUHXY8yz4pgGBvtuS1kxZH1oUYcxTcbIW8NFRvgpeH3Zcv4me02bbixsk7nhn8ttE79Lr1g4vrem4k5Z3Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.51.tgz",
+      "integrity": "sha1-KkJTZXQXZYiAbmAusXpS0yP4KHA="
     },
     "@babel/helper-module-imports": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.46.tgz",
-      "integrity": "sha512-xjgpwrqHiKCZgAcqsNIpZ9kOCC5Ty/VYN1H07v21HbAf/dl0/HeUA0taz3EFv6/7lRgS3qThawTSG0POJQX9vQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.51.tgz",
+      "integrity": "sha1-zgBCgEX7t9XrwOp7+DV4nxU2arI="
     },
     "@babel/helper-module-transforms": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.46.tgz",
-      "integrity": "sha512-IckoWSub3PHNvkWcUEWfKBe8pFUdMhsZMFDcaovcLb+gfxL/zZhQYwedKKKwbzVGIk9k44yjeMQ/OJd4yt4FGQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.51.tgz",
+      "integrity": "sha1-E68MjuQfJ3dDyPxD1EQxXbIyb3M="
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.46.tgz",
-      "integrity": "sha512-PVd7/PGxi82pEKyuDcEpMmlenMLhJCII3lIK4MhXGWrT/6cNMpY6ob5rWOarpXgZjy+JNI5uLPOce28bqq0Wtw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.51.tgz",
+      "integrity": "sha1-IfIVjvCDoSPOHgRmW1u4TzcAgNc="
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.46.tgz",
-      "integrity": "sha512-eRTFH+/1rqDfzx+Z//CYk4TNwhfPQpM/TCs4CmHu2DwCPrqFnKUZLI1KgStfLf//c8FdOqx/U9EPec7s8CbUIA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.51.tgz",
+      "integrity": "sha1-D2pfK20cZERBP4+rYJQNebY8IDE="
     },
     "@babel/helper-regex": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0-beta.46.tgz",
-      "integrity": "sha512-sPDHBt8Y4i6y9rwtxWMvcprlVHAZOOQK5xpS2Nw2q9QEDHRHwVbEpE6EejoUStSclnfJpPK/7ijFgypwc6rXlA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0-beta.51.tgz",
+      "integrity": "sha1-mXIqPAxwRZavsSMoSwqIihoAPYI="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-YrqQ98z8AMZx8f2PGJ4YV1MkXtj+qbwbFV7MOLTiavGSFY7UrN4uQfhKEJ/4GUf4QZdTr5NEmRt0AJrWno8y8w=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.51.tgz",
+      "integrity": "sha1-DtxX4F3LXd4qC27m+NAmGYLe8l8="
     },
     "@babel/helper-replace-supers": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.46.tgz",
-      "integrity": "sha512-FSpK3QKzb58oMEccanHzg1djsYHhGARl08i8BQGBoOyHS6Df+4/8bsQiTnc59Dz5sJoZdb67nKKFjgMsMYi6Kg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.51.tgz",
+      "integrity": "sha1-J5phr7hJR2xsxw1VGfg99KdP+m8="
     },
     "@babel/helper-simple-access": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.46.tgz",
-      "integrity": "sha512-1OEjV/Qnl4u8Dg+jQIYf1TgnfdrYIrdrF7yZwp9mSgsVX2PCyLe7JNTqZ/5v/5RzlF6S+GTe9agkj+EFFTcZUw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.51.tgz",
+      "integrity": "sha1-ydf+zYShgdUKOvzEIvyUqWi+MFA="
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz",
-      "integrity": "sha512-UT7acgV7wsnBPwnqslqcnUFvsPBP4TtVaYM82xPGA7+evAa8q8HXOmFk08qsMK/pX/yy4+51gJJwyw2zofnacA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz",
+      "integrity": "sha1-imw/ZsTSZTUvwHdIT59ugKUauXg="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.46.tgz",
-      "integrity": "sha512-W87M4bP6veTKK66OjzV/rU47tjsWmKj9J0J5BDmxq5BIJB1M13ouQ2FAURa4jGHwjPFWN3D5njBrsrifSOHzbQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.51.tgz",
+      "integrity": "sha1-bFFvsEQQmWTuAxwiUAqDAxOGL7E="
     },
     "@babel/helpers": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.46.tgz",
-      "integrity": "sha512-mbpH9pM3pJzo/tBr75U+zva3pqpyivogt1aofgEoD7bWFAYSuqOudRuz+m4XP6VPxxLoxcA4SFPGkuLRt9+7nQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.51.tgz",
+      "integrity": "sha1-lScr4qtGNNaCBCX4klAxqSiRg5c="
     },
     "@babel/highlight": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.46.tgz",
-      "integrity": "sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.51.tgz",
+      "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0="
+    },
+    "@babel/parser": {
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.51.tgz",
+      "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY="
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-htHMsLBYkM89CplqHTbbemVvzTXXyXkpihetJZUTPpSayfxEd6oIH5uSM91efcf5Rog+1SC0Oq32q9yF/4W3ig=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.51.tgz",
+      "integrity": "sha1-99aS+Uakp/ynjkM2QHoAvq+KTeo="
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.46.tgz",
-      "integrity": "sha512-kWp3bKibdSeSEvEQWcEcs345KPQYT39uM2edFS78NH3Gu6O9mBcnXh5E2BJ1sbE+jJ6jYPOZz4BK/LR7BiF0jA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.51.tgz",
+      "integrity": "sha1-tcZi+GKjCs6U/EhHeDex0lX6ON8="
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.46.tgz",
-      "integrity": "sha512-viGuWOgFT/Tbnn3sYi3g9iJcC3ql7bSjxDs+d+GFgyf3eV2qNIKO/6I+PJAD35fGqDGGBrQhlA6HvW0FzQVtoA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.51.tgz",
+      "integrity": "sha1-W8Rp5ebRuEpdYEa1npDKAWwghtY="
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.46.tgz",
-      "integrity": "sha512-igLQzZYcSrY/W3eACq6Nrf9u9mfw7m5G6+JeTZlyI7w0z+upGvWvrpTaAP1Gni6MckQkx5q+pspgpV+/5ioPXg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.51.tgz",
+      "integrity": "sha1-aSGvHcPaD87d4KYQc+7Hl7jKpwc="
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.46.tgz",
-      "integrity": "sha512-NwtgTQ+I8B2eo5h1mZF64nloLaGQuPM4M/c/swvyvqHoWLissHhm94rOE2Ghte8WMgQ/Nw3bqJd59kpbckqmdQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.51.tgz",
+      "integrity": "sha1-8Mv28iqHnFk6B+jhQckI4IdwHpE="
     },
     "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.46.tgz",
-      "integrity": "sha512-D4ek6tZa80NgaTSprPOVxj8vxjChh6UCWgCT/ZvCwAa6CBe3iqUCuOwZQLjU41aDdeuR7C02wxl3rcb25wCRLA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.51.tgz",
+      "integrity": "sha1-nAru9X0GeONybbFxqnPkdKJd5/I="
     },
     "@babel/plugin-syntax-flow": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.46.tgz",
-      "integrity": "sha512-HFChD9R2w+8+Jt5539SVaKKSYuMvbCgYG7LmuISycaJW16aS6fNS6V8jr8U/HKJk3bhIG5SkATBYedy5zGR+sg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0-beta.51.tgz",
+      "integrity": "sha1-3giDE0QG+Q+Vi2QHPpdJiAIp3lY="
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.46.tgz",
-      "integrity": "sha512-aYN4vmO4nMux1W36F6/YP2ugNQ0cilrs1eU4jClLrlIouxqd9hqBloWtlGmGlyDxIRV5kzr+UWwridLDb+cN5g=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.51.tgz",
+      "integrity": "sha1-9nKjNxxro/5Tv/0uirXcQElTgs8="
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.46.tgz",
-      "integrity": "sha512-MMv6WG69jmcSLXdUeHvoev5RkuP/QuJZwCB4jXp2gtss//avs4Sns+t0VpGKTf9umhvRq44HFO6PVjVG85F+/Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.51.tgz",
+      "integrity": "sha1-bVehGcHwZMRY5FutRb7wqD7RDAA="
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-GgeFCCMHXWRkPDXWKin76qiZh+DAYdQShmk8SmzDj6IAgPHyNqkxHN/8gsmNe5/7IWFFOKUuM9TNU7fgY7z7Gg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.51.tgz",
+      "integrity": "sha1-KbnbbjhoigbsXCVjmZbYml6/2+M="
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-obykYLqAd3tujTjHYE+dln5+nDhm+R5FmUcxXFr/Mx6LK1NgrTQ9TdPPOcMCD08r8SDljFpMopuz9upN/xJlbw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.51.tgz",
+      "integrity": "sha1-lFOFBVoubTVmv1WvEnyNclzToXM="
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-0paq0AtTp3TXbXdzWwsL8ddacmo/g/14IgIZgs5BzUTrfROKQThYVccEBPqRnprTgvM0JXyDVfNSgLB4akCTjg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.51.tgz",
+      "integrity": "sha1-IxKbr4FEcfOeqU7shKsf/nbJ/pY="
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.46.tgz",
-      "integrity": "sha512-7OwS0ObI6nLacEKP1HCdnoIQnHBqOV6IgtKGiPO+Nj03OnZ1Yo2aeK9sfOtwL43aNztnKqFVt2L5PfZg4VGidA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.51.tgz",
+      "integrity": "sha1-vlVcefDaTrFop/4W14eppxc3AeA="
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.46.tgz",
-      "integrity": "sha512-EDp/qQAURfrX6hNM+VrLSSA+cGiwDeZL0ZTTt6a7PNSFABCw4qwKJHx3Q7me1oV7q3U/GJwPS4Aym2QTDmNGvg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.51.tgz",
+      "integrity": "sha1-BD8x+2MnZkoy2Lpl3hV5nv3GXaA="
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.46.tgz",
-      "integrity": "sha512-0ne9TL53fXH+cBI591R1JSpPhu0d2Wd9dbD8jLCJFV4tlMfqQ+Rcm65RhWWqjEBZfGv2+FuOnwB4HJRHakdW+Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.51.tgz",
+      "integrity": "sha1-jHKhqz4HZwNP+eZzLSWBwjwDLv4="
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.46.tgz",
-      "integrity": "sha512-l9x0+T29Njwp6smLbTIU2HG2s4ROd9DAIQcfciEfpjAqscXEst0M4X9+UvjQsuaOgPFmQTdAn9xOwNFXnRP7Tg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.51.tgz",
+      "integrity": "sha1-1dRU5XTH7zPuSekYsEivspvpNfY="
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-acomgoNW/fwWSmBlhH22C9Eyl1Y/vADBSqzyIRWJGpm4frLhd49QQgKXbRGRHUDxyifXuZDF9+3pRhEmi7/HXA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.51.tgz",
+      "integrity": "sha1-BLTj5As3AREt1u2jliUTJ1eIH9Q="
     },
     "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.46.tgz",
-      "integrity": "sha512-ZyMayIXoDPsYYa8FVypQpcxeHX65l6lQ/nA4DRTSJUVvoQDytfNlH3Y3yQhGwyrr2APsCpq4MGmUAp+Id8KWeA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0-beta.51.tgz",
+      "integrity": "sha1-Z9Q0RZ96eyap8qaFW8EuZ4lOR6Y="
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.46.tgz",
-      "integrity": "sha512-a1gpwuO26szyz5K2FrRrI5nUDgvkaJfZ7GeDtFAH8XyrK/pNdtpW/7DFCf1PdQc6SbEMM/1QXsH7Y2YRkWoTeA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.51.tgz",
+      "integrity": "sha1-RPR2sGxANVF6hAOiYk+xZMQ3FFU="
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.46.tgz",
-      "integrity": "sha512-Uuo7pRsBkrLrDg6XpOAMfwhKw56SB5qVBniUVM04uf8wf92S2Z5tSPNNfn1iTgphuckAO9vg86l2XJ0Y/QD4YQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.51.tgz",
+      "integrity": "sha1-RbB6lCI8+iJnAaeUYLQrMt8d7AU="
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.46.tgz",
-      "integrity": "sha512-3wLCWVkEhhQiVqqml4y9G6GJT6WA/mkxQ6TRy+4I46z00WWbEDENJcRTS14oNKzeRIo4yJylbVB1wUCW7HuJ9A=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.51.tgz",
+      "integrity": "sha1-QDj54VJE4QkAy4n1t5bQUPHrGVs="
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.46.tgz",
-      "integrity": "sha512-T+TV4rRuTubvjqEwBF5xib3vnfJgjQ62qJqHprTaJDBtF0ofpbv/A6x86EEr51iPymHc84eM+F1zyFEtJvKYwQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.51.tgz",
+      "integrity": "sha1-rBjoi8HXm3GL2vSKdWgzzfW9zr8="
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.46.tgz",
-      "integrity": "sha512-RnkdYrayTlQ0VFoyIjvY/cCp/1lJJkYE2lFcRNg6+Skd3g41PnocsHhQ5NUQjMNogL+RnNan3S/2S/i7S4zm+Q=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.51.tgz",
+      "integrity": "sha1-mQGVsd/bG8yUkG8wNJUQie0e3U4="
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.0.0-beta.46.tgz",
-      "integrity": "sha512-q1jSyGXA4zPWLpJZ7rPLpbQTv27VHSHWeU16xAM5PnmI1ZrL5XmhmhAfZ4D2+W3NfXbvaEUyxPBnwBYyGPKrNA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.0.0-beta.51.tgz",
+      "integrity": "sha1-52mYp1Xf0svWaAtRNuWz1CSBH1M="
     },
     "@babel/plugin-transform-react-display-name": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.46.tgz",
-      "integrity": "sha512-/a7wwzNrYqReyuOM8rBB9iAOLaubvGHM9w3eUeput/DnEq/V+dJuBgktpF6mw/MQjwjna1B/3BbWsn1PaBw8bw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.51.tgz",
+      "integrity": "sha1-G0i9NN+pCHJSyHB9Kb0d8uiCHL4="
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.46.tgz",
-      "integrity": "sha512-b8VtHVQub3h7lXG1ShaCKgGJdra7fRlUK6hx1eCcIWAPYnJMz4soLMSPiXmyjDA5L0CbYmyTkceU1GjbeJmaaw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.51.tgz",
+      "integrity": "sha1-evhJhRi4OQZAVDg3AZiAjKbmOxA="
     },
     "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.46.tgz",
-      "integrity": "sha512-keXGiKQNzqHXpplpz/Eu+F+OC/k6M3kbEBOqoDbbYeJVmWARVADWwRnCCsW6yevSyON4CTU5mouVadTIY9YSpA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.51.tgz",
+      "integrity": "sha1-pPCYWX/nCYVUQ2b4k6xHOJhk2JQ="
     },
     "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.46.tgz",
-      "integrity": "sha512-vSSghGn+ER6d5gBtNnTZAxPxBSs1ngyyVlHse/geHSv7YnzmrCOUrtVl+t4M2/EO3CW2m8nkMfpnMW5FCmg+Zw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.51.tgz",
+      "integrity": "sha1-aZncSRyLRgLvtNC9G6/JNq1pbs8="
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-P6d8ckSjKlbr/1SL1NBO6ieFxSebTiRWd2R8/styUIizJWQlEB0ITQ7l8vv3jXGjJ0mh7lxBTegXejRkTGKKgw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.51.tgz",
+      "integrity": "sha1-U28NWZ0nU9ygor6KZeLCRKe1YSs="
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.46.tgz",
-      "integrity": "sha512-mdgrBPXF+7cl+Y8dBynUxK90U17fQdH4zBsNxV6GYyI35WiUUZYFiXG2wKZN+1LClhavD9cOnOLpCxaNQy7g2A=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.51.tgz",
+      "integrity": "sha1-DJyrF09OPhMWWf1lxc6OPXM3aCA="
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.46.tgz",
-      "integrity": "sha512-1QkKFWPsjrvMppycLwjPBXF+usSnGvbTxGe0Q+eIzcZyhabwGCsCgkmDIKMisPSAi6F7bM5H1S8VbE85IW3oRg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.51.tgz",
+      "integrity": "sha1-3bwLGuHds7z+aWnyyWgQPxHjK9k="
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.46.tgz",
-      "integrity": "sha512-R0GvFdJnFrgTlmZfFtCXk81uvq5S3FuY38FnRsxDt6Yx/sE8jCmmrRe7XHZOnXXGP3ZWY9icILUmzWHOf91jbA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.51.tgz",
+      "integrity": "sha1-EAEpvI19z0vHmtzWEppCFCWdilA="
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.46.tgz",
-      "integrity": "sha512-goMgOLODjG1cgFHlKACh/NT/wrnmuRi2CpXsjOan10eZce0fk9kahYz/04cqhppmwtV/vQWwH2ikAHODSD8r5w=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.51.tgz",
+      "integrity": "sha1-SMvqzTG9Be6AC1+svLCcV4G9lhk="
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.46.tgz",
-      "integrity": "sha512-2iGMsHWVAQq9X6p3VNjktJCH6ZXHQHi3NTPLKh5d4bEW8+M3H7LXLNqk1yUm/Uwt0tzh1FUfb/EU2sEPbrBrVA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.51.tgz",
+      "integrity": "sha1-LQWV9WRh1DRbo1w41zAz+H7Lu8g="
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.46.tgz",
-      "integrity": "sha512-l+CfLR2c5KzZ/uZlkflNe7nK2hiEahc/FeiUCTd5Krj4aCKDdLLSdb4Lowf5hdZbqIPQc9TdL9SZt80YhUlmFw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.51.tgz",
+      "integrity": "sha1-SVDAyOPJ4eFB5Fzrq15hSCYyBMM="
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.46.tgz",
-      "integrity": "sha512-XWQ7uJ0HL/xdMesKzt1uq5CmZPBqDiEno+FBeYuOJu1IWjpr3yXfEzH/nW17KESXGRv68mLTr+fIeSwcC+qVFg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.51.tgz",
+      "integrity": "sha1-kBn5FQj0C1CmRDUEMijEFCws2GQ="
     },
     "@babel/preset-react": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0-beta.46.tgz",
-      "integrity": "sha512-+Xl9AH/rhI7FTX0OxNXM4oGljpeCs1nwPm2IjD9+mXO/+dWdGpa+yTcjYYpIWAK4KQrSQ+27T6DtJ6fZPTqYQA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0-beta.51.tgz",
+      "integrity": "sha1-lX2BKobZbIkhSSi3mAB0j1GTXkk="
     },
     "@babel/runtime": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz",
-      "integrity": "sha512-/3a3USMKk54BEHhDgY8rtxtaQOs4bp4aQwo6SDtdwmrXmgSgEusWuXNX5oIs/nwzmTD9o8wz2EyAjA+uHDMmJA=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.51.tgz",
+      "integrity": "sha1-SLjtGDBwNMZiD2Q1FGUMoszAFlo="
     },
     "@babel/template": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.46.tgz",
-      "integrity": "sha512-3/qi4m0l6G/vZbEwtqfzJk73mYtuE7nvAO1zT3/ZrTAHy4sHf2vaF9Eh1w+Tau263Yrkh0bjVQPb9zw6G+GeMQ=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.51.tgz",
+      "integrity": "sha1-lgKkCuvPNXrpZ34lMu9fyBD1+/8="
     },
     "@babel/traverse": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.46.tgz",
-      "integrity": "sha512-IU7MTGbcjpfhf5tyCu3sDB7sWYainZQcT+CqOBdVZXZfq5MMr130R7aiZBI2g5dJYUaW1PS81DVNpd0/Sq/Gzg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.51.tgz",
+      "integrity": "sha1-mB2vLOw0emIx06odnhgDsDqqpKg="
     },
     "@babel/types": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.46.tgz",
-      "integrity": "sha512-uA5aruF2KKsJxToWdDpftsrPOIQtoGrGno2hiaeO9JRvfT9xZdK11nPoC+/RF9emNzmNbWn4HCRdCY+McT5Nbw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.51.tgz",
+      "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk="
     },
     "acorn": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-      "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ=="
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz",
+      "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -342,19 +347,34 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
     },
     "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
     },
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
     "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "atob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
     },
     "babel-helper-evaluate-path": {
       "version": "0.2.0",
@@ -447,9 +467,9 @@
       "integrity": "sha512-NiOvvA9Pq6bki6nP4BayXwT5GZadw7DJFDDzHmkpnOQpENWe8RtHtKZM44MG1R6EQ5XxgbLdsdhswIzTkFlO5g=="
     },
     "babel-plugin-transform-es2015-modules-reify": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.15.1.tgz",
-      "integrity": "sha512-QO76PVHIApDp3afwjk+VMpymKZhUeo3tZg/b2ND8g8C859h4xaNPdx6QguxrGaf2ch3IsbbcbcgVseIbIHh+MA=="
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.16.0.tgz",
+      "integrity": "sha512-c0DTHJdkXGE/PcJbPzG9vQ3QEP4kMjoLzs77ulMA7y9iagvsPmmH27PtZGEryubGG/Kiywh9H/JXGovgF+9hig=="
     },
     "babel-plugin-transform-inline-consecutive-adds": {
       "version": "0.2.0",
@@ -457,24 +477,24 @@
       "integrity": "sha512-GlhOuLOQ28ua9prg0hT33HslCrEmz9xWXy9ZNZSACppCyRxxRW+haYtRgm7uYXCcd0q8ggCWD2pfWEJp5iiZfQ=="
     },
     "babel-plugin-transform-member-expression-literals": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.1.tgz",
-      "integrity": "sha1-lr4umWjn9UlzM64DKE7NU0BAVIk="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz",
+      "integrity": "sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8="
     },
     "babel-plugin-transform-merge-sibling-variables": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.1.tgz",
-      "integrity": "sha1-kHHkQ7IUWM5rCo04QbpaF09dwoI="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz",
+      "integrity": "sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4="
     },
     "babel-plugin-transform-minify-booleans": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.1.tgz",
-      "integrity": "sha1-UsunnAD6UJc3BkBV76siFm4UDE0="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz",
+      "integrity": "sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg="
     },
     "babel-plugin-transform-property-literals": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.1.tgz",
-      "integrity": "sha1-aXD5Oxd5OrzenPJdLozRPgCI5ck="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz",
+      "integrity": "sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk="
     },
     "babel-plugin-transform-regexp-constructors": {
       "version": "0.2.0",
@@ -482,14 +502,14 @@
       "integrity": "sha512-7IsQ6aQx6LAaOqy97/PthTf+5Nx9grZww3r6E62IdWe76Yr8KsuwVjxzqSPQvESJqTE3EMADQ9S0RtwWDGNG9Q=="
     },
     "babel-plugin-transform-remove-console": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.1.tgz",
-      "integrity": "sha1-QP6V2YyuWBHYoOGImBLXixKFllE="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+      "integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A="
     },
     "babel-plugin-transform-remove-debugger": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.1.tgz",
-      "integrity": "sha1-dlUtLp1sQ9nGdrv8CPPCoswUvhQ="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz",
+      "integrity": "sha1-QrcnYxyXl44estGZp67IShgznvI="
     },
     "babel-plugin-transform-remove-undefined": {
       "version": "0.2.0",
@@ -497,65 +517,153 @@
       "integrity": "sha512-O8v57tPMHkp89kA4ZfQEYds/pzgvz/QYerBJjIuL5/Jc7RnvMVRA5gJY9zFKP7WayW8WOSBV4vh8Y8FJRio+ow=="
     },
     "babel-plugin-transform-simplify-comparison-operators": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.1.tgz",
-      "integrity": "sha1-Ww0GmAoXp4D1MYsnTAC+L7HHxP4="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz",
+      "integrity": "sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk="
     },
     "babel-plugin-transform-undefined-to-void": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.1.tgz",
-      "integrity": "sha1-19+cHdDsEuD/6JXtFEX2Hxv14iE="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz",
+      "integrity": "sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA="
     },
     "babel-preset-meteor": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-7.0.0-beta.46.tgz",
-      "integrity": "sha512-XrxvtwFrvs046DIQXMkrb0QM5t8xj8YQ8jc9cTOmzL4VHvAEFttlzGkgBfCLa2cKB5nE7dbacxTgDQPKPtC5Lw=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-7.0.0-beta.51.tgz",
+      "integrity": "sha512-IUaRprdQQzptcMOPpcL+FCiAVr8Zxq9vht5+ij87CEtgbuhmcr35VuBx2H211melKXgy86P0vvO2AgL0FkJe8A=="
     },
     "babel-preset-minify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz",
       "integrity": "sha512-mR8Q44RmMzm18bM2Lqd9uiPopzk5GDCtVuquNbLFmX6lOKnqWoenaNBxnWW0UhBFC75lEHTIgNGCbnsRI0pJVw=="
     },
-    "babylon": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.46.tgz",
-      "integrity": "sha512-WFJlg2WatdkXRFMpk7BN/Uzzkjkcjk+WaqnrSCpay+RYl4ypW9ZetZyT9kNt22IH/BQNst3M6PaaBn9IXsUNrg=="
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY="
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
+        }
+      }
     },
     "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="
     },
     "chalk": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-      "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw=="
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY="
+        }
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA="
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ=="
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
     },
     "convert-source-map": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
       "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU="
     },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
     "core-js": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz",
-      "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
     "debug": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
       "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
     },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
+        }
+      }
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -567,109 +675,209 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
     },
     "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY="
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        }
+      }
     },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc="
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
+        }
+      }
     },
     "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE="
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY="
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
+        }
+      }
     },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        }
+      }
     },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4="
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk="
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q="
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg="
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
     "globals": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz",
-      "integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA=="
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+      "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ=="
     },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc="
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc="
+        }
+      }
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="
     },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
+    },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
     },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ="
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
+      }
     },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
     },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM="
-    },
     "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
     },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
-    },
-    "is-primitive": {
+    "is-odd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+        }
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "isarray": {
       "version": "1.0.0",
@@ -677,9 +885,9 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -697,14 +905,14 @@
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
@@ -721,10 +929,20 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg="
     },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48="
+    },
     "meteor-babel": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-7.0.0-beta.46.tgz",
-      "integrity": "sha512-WbL1SR2kFT8P++eeqdjPhkDKi7zhgtYdr3fT73UdqftYRl0d1FpegzUTW3Rh8HdjS/PlqCQdBIbFa7cjo/uIKg=="
+      "version": "7.0.0-beta.51",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-7.0.0-beta.51.tgz",
+      "integrity": "sha512-J315Kof9+8cjVP53k0lqGfgGq2+jY9b8V7NnbHqjX2kgBvcqHHIpfHslYtSM/4nG0uJdckUeZsB9HQdWtewRHA=="
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -732,78 +950,88 @@
       "integrity": "sha1-8uXZ+HlvvS6JAQI9dpnlsgLqn7A="
     },
     "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU="
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
+        }
+      }
     },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk="
+    "nanomatch": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA=="
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo="
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY="
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
     },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw="
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs="
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
     },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
-    "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc="
-        }
-      }
-    },
     "regenerate": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
     },
     "regenerate-unicode-properties": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-5.1.3.tgz",
-      "integrity": "sha512-Yjy6t7jFQczDhYE+WVm7pg6gWYE258q4sUkk9qDErwXJIqx7jU9jGrMFHutJK/SRfcg7MEkXjGaYiVlOZyev/A=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz",
+      "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="
     },
     "regenerator-runtime": {
       "version": "0.11.1",
@@ -811,29 +1039,29 @@
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
     "regenerator-transform": {
-      "version": "0.12.3",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.12.3.tgz",
-      "integrity": "sha512-y2uxO/6u+tVmtEDIKo+tLCtI0GcbQr0OreosKgCd7HP4VypGjtTrw79DezuwT+W5QX0YWuvpeBOgumrepwM1kA=="
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.12.4.tgz",
+      "integrity": "sha512-p2I0fY+TbSLD2/VFTFb/ypEHxs3e3AjU0DzttdPqk2bSmDhfSh5E54b86Yc6XhUa5KykK1tgbvZ4Nr82oCJWkQ=="
     },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="
     },
     "regexpu-core": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.1.3.tgz",
-      "integrity": "sha512-mB+njEzO7oezA57IbQxxd6fVPOeWKDmnGvJ485CwmfNchjHe5jWwqKepapmzUEj41yxIAqOg+C4LbXuJlkiO8A=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
+      "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw=="
     },
     "regjsgen": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.3.0.tgz",
-      "integrity": "sha1-DuSj6SdkMM2iXx54nqbBW4ewy0M="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz",
+      "integrity": "sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA=="
     },
     "regjsparser": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.2.1.tgz",
-      "integrity": "sha1-w3h1U/rwTndcMCEC7zRtmVAA7Bw=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz",
+      "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
@@ -843,14 +1071,9 @@
       }
     },
     "reify": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.15.1.tgz",
-      "integrity": "sha512-XUIO34oFNXyb8cYRw3eVN0oqD3LwxaBFml5cHZf3Uiw6v+pfPB0D7kxKCdBjvaa1cneDtUqqQ94MPQkJt2kEWg=="
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.16.2.tgz",
+      "integrity": "sha512-9kL/IYcFiBbwpQFScNcFBJ5zhCEJTNujeDEEv5SoSg5er0V5CDbef2zNEk9FBeI9oehGOG5zM4APXgp5n3Llbw=="
     },
     "repeat-element": {
       "version": "1.1.2",
@@ -867,16 +1090,131 @@
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="
     },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4="
+    },
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        }
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY="
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY="
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY="
+        }
+      }
+    },
     "supports-color": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
@@ -887,30 +1225,103 @@
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg="
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
     },
     "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz",
-      "integrity": "sha512-iG/2t0F2LAU8aZYPkX5gi7ebukHnr3sWFESpb+zPQeeaQwOkfoO6ZW17YX7MdRPNG9pCy+tjzGill+Ah0Em0HA=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
     },
     "unicode-match-property-ecmascript": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz",
-      "integrity": "sha512-nFcaBFcr08UQNF15ZgI5ISh3yUnQm7SJRRxwYrL5VYX46pS+6Q7TCTv4zbK+j6/l7rQt0mMiTL2zpmeygny6rA=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz",
-      "integrity": "sha512-lM8B0FDZQh9yYGgiabRQcyWicB27VLOolSBRIxsO7FeQPtg+79Oe7sC8Mzr8BObDs+G9CeYmC/shHo6OggNEog=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
+      "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz",
-      "integrity": "sha512-TdDmDOTxEf2ad1g3ZBpM6cqKIb2nJpVlz1Q++casDryKz18tpeMBhSng9hjC1CTQCkOV9Rw2knlSB6iRo7ad1w=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg=="
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8="
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE="
+        }
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk="
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        }
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "use": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
+      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="
     }
   }
 }
diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 45d72ede78..14fdee6143 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -9,6 +9,7 @@ BabelCompiler = function BabelCompiler(extraFeatures) {
   this.extraFeatures = extraFeatures;
   this._babelrcCache = null;
   this._babelrcWarnings = Object.create(null);
+  this.cacheDirectory = null;
 };
 
 var BCp = BabelCompiler.prototype;
@@ -20,15 +21,27 @@ var hasOwn = Object.prototype.hasOwnProperty;
 var isMeteorPre144 = semver.lt(process.version, "4.8.1");
 
 BCp.processFilesForTarget = function (inputFiles) {
+  var compiler = this;
+
   // Reset this cache for each batch processed.
   this._babelrcCache = null;
 
   inputFiles.forEach(function (inputFile) {
-    var toBeAdded = this.processOneFileForTarget(inputFile);
-    if (toBeAdded) {
-      inputFile.addJavaScript(toBeAdded);
+    if (inputFile.supportsLazyCompilation) {
+      inputFile.addJavaScript({
+        path: inputFile.getPathInPackage(),
+        hash: inputFile.getSourceHash(),
+        bare: !! inputFile.getFileOptions().bare
+      }, function () {
+        return compiler.processOneFileForTarget(inputFile);
+      });
+    } else {
+      var toBeAdded = compiler.processOneFileForTarget(inputFile);
+      if (toBeAdded) {
+        inputFile.addJavaScript(toBeAdded);
+      }
     }
-  }, this);
+  });
 };
 
 // Returns an object suitable for passing to inputFile.addJavaScript, or
@@ -55,8 +68,11 @@ BCp.processOneFileForTarget = function (inputFile, source) {
     sourceMap: null,
     bare: !! fileOptions.bare
   };
-  var cacheDeps = {
-    sourceHash: toBeAdded.hash
+  var cacheOptions = {
+    cacheDirectory: this.cacheDirectory,
+    cacheDeps: {
+      sourceHash: toBeAdded.hash,
+    },
   };
 
   // If you need to exclude a specific file within a package from Babel
@@ -71,11 +87,14 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       ! excludedFileExtensionPattern.test(inputFilePath)) {
 
     var extraFeatures = Object.assign({}, this.extraFeatures);
+    var arch = inputFile.getArch();
 
-    if (inputFile.getArch().startsWith("os.")) {
+    if (arch.startsWith("os.")) {
       // Start with a much simpler set of Babel presets and plugins if
       // we're compiling for Node 8.
       extraFeatures.nodeMajorVersion = parseInt(process.versions.node);
+    } else if (arch === "web.browser") {
+      extraFeatures.modernBrowsers = true;
     }
 
     if (! extraFeatures.hasOwnProperty("jscript")) {
@@ -87,9 +106,13 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     var babelOptions = Babel.getDefaultOptions(extraFeatures);
 
-    this.inferExtraBabelOptions(inputFile, babelOptions, cacheDeps);
+    this.inferExtraBabelOptions(
+      inputFile,
+      babelOptions,
+      cacheOptions.cacheDeps,
+    );
 
-    babelOptions.sourceMap = true;
+    babelOptions.sourceMaps = true;
     babelOptions.filename =
       babelOptions.sourceFileName = packageName
       ? "packages/" + packageName + "/" + inputFilePath
@@ -97,7 +120,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 
     try {
       var result = profile('Babel.compile', function () {
-        return Babel.compile(source, babelOptions, cacheDeps);
+        return Babel.compile(source, babelOptions, cacheOptions);
       });
     } catch (e) {
       if (e.loc) {
@@ -140,7 +163,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
 };
 
 BCp.setDiskCacheDirectory = function (cacheDir) {
-  Babel.setCacheDir(cacheDir);
+  this.cacheDirectory = cacheDir;
 };
 
 function profile(name, func) {
@@ -170,57 +193,64 @@ BCp._inferFromBabelRc = function (inputFile, babelOptions, cacheDeps) {
   if (babelrcPath) {
     if (! hasOwn.call(this._babelrcCache, babelrcPath)) {
       try {
-        this._babelrcCache[babelrcPath] =
-          JSON.parse(inputFile.readAndWatchFile(babelrcPath));
+        this._babelrcCache[babelrcPath] = {
+          controlFilePath: babelrcPath,
+          controlFileData: JSON.parse(
+            inputFile.readAndWatchFile(babelrcPath)),
+          deps: Object.create(null),
+        };
       } catch (e) {
         if (e instanceof SyntaxError) {
           e.message = ".babelrc is not a valid JSON file: " + e.message;
         }
-
         throw e;
       }
     }
 
-    return this._inferHelper(
-      inputFile,
-      babelOptions,
-      babelrcPath,
-      this._babelrcCache[babelrcPath],
-      cacheDeps
-    );
+    const cacheEntry = this._babelrcCache[babelrcPath];
+
+    if (this._inferHelper(inputFile, cacheEntry)) {
+      merge(babelOptions, cacheEntry, "presets");
+      merge(babelOptions, cacheEntry, "plugins");
+      Object.assign(cacheDeps, cacheEntry.deps);
+      return true;
+    }
   }
 };
 
 BCp._inferFromPackageJson = function (inputFile, babelOptions, cacheDeps) {
   var pkgJsonPath = inputFile.findControlFile("package.json");
   if (pkgJsonPath) {
-    if (! hasOwn.call(this._babelrcCache, pkgJsonPath)) {
-      this._babelrcCache[pkgJsonPath] = JSON.parse(
-        inputFile.readAndWatchFile(pkgJsonPath)
-      ).babel || null;
-    }
+    const cacheEntry = hasOwn.call(this._babelrcCache, pkgJsonPath)
+      ? this._babelrcCache[pkgJsonPath]
+      : this._babelrcCache[pkgJsonPath] = {
+          controlFilePath: pkgJsonPath,
+          controlFileData: JSON.parse(
+            inputFile.readAndWatchFile(pkgJsonPath)
+          ).babel || null,
+          deps: Object.create(null),
+        };
 
-    return this._inferHelper(
-      inputFile,
-      babelOptions,
-      pkgJsonPath,
-      this._babelrcCache[pkgJsonPath],
-      cacheDeps
-    );
+    if (this._inferHelper(inputFile, cacheEntry)) {
+      merge(babelOptions, cacheEntry, "presets");
+      merge(babelOptions, cacheEntry, "plugins");
+      Object.assign(cacheDeps, cacheEntry.deps);
+      return true;
+    }
   }
 };
 
-BCp._inferHelper = function (
-  inputFile,
-  babelOptions,
-  controlFilePath,
-  babelrc,
-  cacheDeps
-) {
-  if (! babelrc) {
+BCp._inferHelper = function (inputFile, cacheEntry) {
+  if (! cacheEntry.controlFileData) {
     return false;
   }
 
+  if (hasOwn.call(cacheEntry, "finalInferHelperResult")) {
+    // We've already run _inferHelper and populated
+    // cacheEntry.{presets,plugins}, so we can return early here.
+    return cacheEntry.finalInferHelperResult;
+  }
+
   var compiler = this;
 
   function walkBabelRC(obj, path) {
@@ -281,7 +311,7 @@ BCp._inferHelper = function (
         // The value is a string that we need to require.
         const result = requireWithPath(value, path);
         if (result && result.module) {
-          cacheDeps[result.name] = result.version;
+          cacheEntry.deps[result.name] = result.version;
           return walkBabelRC(result.module, path);
         }
 
@@ -307,20 +337,23 @@ BCp._inferHelper = function (
     prefixes.push("");
 
     try {
-      return requireWithPrefixes(inputFile, id, prefixes, controlFilePath);
+      return requireWithPrefixes(
+        inputFile, id, prefixes,
+        cacheEntry.controlFilePath
+      );
     } catch (e) {
       if (e.code !== "MODULE_NOT_FOUND") {
         throw e;
       }
 
       if (! hasOwn.call(compiler._babelrcWarnings, id)) {
-        compiler._babelrcWarnings[id] = controlFilePath;
+        compiler._babelrcWarnings[id] = cacheEntry.controlFilePath;
 
         console.error(
           "Warning: unable to resolve " +
             JSON.stringify(id) +
             " in " + path.join(".") +
-            " of " + controlFilePath + ", due to:"
+            " of " + cacheEntry.controlFilePath + ", due to:"
         );
 
         console.error(e.stack || e);
@@ -330,26 +363,29 @@ BCp._inferHelper = function (
     }
   }
 
-  const clean = walkBabelRC(babelrc);
-  merge(babelOptions, clean, "presets");
-  merge(babelOptions, clean, "plugins");
+  const { controlFileData } = cacheEntry;
+  const clean = walkBabelRC(controlFileData);
+  merge(cacheEntry, clean, "presets");
+  merge(cacheEntry, clean, "plugins");
 
-  if (babelrc && babelrc.env) {
+  if (controlFileData &&
+      controlFileData.env) {
     const envKey =
       process.env.BABEL_ENV ||
       process.env.NODE_ENV ||
       "development";
 
-    const clean = walkBabelRC(babelrc.env[envKey]);
+    const clean = walkBabelRC(controlFileData.env[envKey]);
 
     if (clean) {
-      merge(babelOptions, clean, "presets");
-      merge(babelOptions, clean, "plugins");
+      merge(cacheEntry, clean, "presets");
+      merge(cacheEntry, clean, "plugins");
     }
   }
 
-  return !! (babelOptions.presets ||
-             babelOptions.plugins);
+  return cacheEntry.finalInferHelperResult =
+    !! (cacheEntry.presets ||
+        cacheEntry.plugins);
 };
 
 function merge(babelOptions, babelrc, name) {
@@ -373,12 +409,14 @@ function requireWithPrefixes(inputFile, id, prefixes, controlFilePath) {
         // Call inputFile.resolve here rather than inputFile.require so
         // that the import doesn't fail due to missing transitive
         // dependencies imported by the preset or plugin.
-        if (inputFile.resolve(prefix + id)) {
+        if (inputFile.resolve(prefix + id, controlFilePath)) {
           presetOrPluginId = prefix + id;
         }
 
         presetOrPluginMeta = inputFile.require(
-          packageNameFromTopLevelModuleId(prefix + id) + "/package.json");
+          packageNameFromTopLevelModuleId(prefix + id) + "/package.json",
+          controlFilePath
+        );
 
         return true;
 
@@ -403,7 +441,11 @@ function requireWithPrefixes(inputFile, id, prefixes, controlFilePath) {
         // to compile application code the same way Meteor does.
         return null;
       }
-      presetOrPlugin = inputFile.require(presetOrPluginId);
+
+      presetOrPlugin = inputFile.require(
+        presetOrPluginId,
+        controlFilePath
+      );
     }
 
   } else {
diff --git a/packages/babel-compiler/babel.js b/packages/babel-compiler/babel.js
index 90f88704aa..2adbbae925 100644
--- a/packages/babel-compiler/babel.js
+++ b/packages/babel-compiler/babel.js
@@ -9,13 +9,7 @@ function getMeteorBabel() {
 function getDefaultOptions(extraFeatures) {
   // See https://github.com/meteor/babel/blob/master/options.js for more
   // information about what the default options are.
-  var options = getMeteorBabel().getDefaultOptions(extraFeatures);
-
-  // The sourceMap option should probably be removed from the default
-  // options returned by meteorBabel.getDefaultOptions.
-  delete options.sourceMap;
-
-  return options;
+  return getMeteorBabel().getDefaultOptions(extraFeatures);
 }
 
 Babel = {
@@ -28,11 +22,16 @@ Babel = {
     return getMeteorBabel().parse(source);
   },
 
-  compile: function (source, options) {
-    options = options || getDefaultOptions();
-    return getMeteorBabel().compile(source, options);
+  compile: function (source, babelOptions, cacheOptions) {
+    return getMeteorBabel().compile(
+      source,
+      babelOptions || getDefaultOptions(),
+      cacheOptions,
+    );
   },
 
+  // This method is deprecated in favor of passing
+  // cacheDeps.cacheDirectory to Babel.compile (see above).
   setCacheDir: function (cacheDir) {
     getMeteorBabel().setCacheDir(cacheDir);
   },
@@ -44,5 +43,9 @@ Babel = {
 
   getMinifierOptions: function (extraFeatures) {
     return getMeteorBabel().getMinifierOptions(extraFeatures);
+  },
+
+  getMinimumModernBrowserVersions: function () {
+    return Npm.require("meteor-babel/modern-versions.js").get();
   }
 };
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 089c9708f9..a37b2028f3 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,19 +6,21 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '7.0.8'
+  version: '7.2.0'
 });
 
 Npm.depends({
-  'meteor-babel': '7.0.0-beta.46'
+  'meteor-babel': '7.0.0-beta.51'
 });
 
 Package.onUse(function (api) {
   api.use('ecmascript-runtime', 'server');
+  api.use('modern-browsers');
 
   api.addFiles([
     'babel.js',
-    'babel-compiler.js'
+    'babel-compiler.js',
+    'versions.js',
   ], 'server');
 
   api.export('Babel', 'server');
diff --git a/packages/babel-compiler/versions.js b/packages/babel-compiler/versions.js
new file mode 100644
index 0000000000..fddb7c35e8
--- /dev/null
+++ b/packages/babel-compiler/versions.js
@@ -0,0 +1,11 @@
+// Make sure code compiled with features.modernBrowsers is delivered only
+// to browsers that satisfy the assumptions of meteor-babel's modern Babel
+// configuration.
+Package["modern-browsers"].setMinimumBrowserVersions(
+  Babel.getMinimumModernBrowserVersions(),
+  // Although module.id is the recommended source string to pass as the
+  // second argument to setMinimumBrowserVersions, we can't use module.id
+  // here because babel-compiler cannot depend on the modules package. We
+  // can still make this string look like any other module.id, though.
+  "/node_modules/meteor/babel-compiler/versions.js"
+);
diff --git a/packages/boilerplate-generator/generator.js b/packages/boilerplate-generator/generator.js
index e3c536bf0c..d83ca7b915 100644
--- a/packages/boilerplate-generator/generator.js
+++ b/packages/boilerplate-generator/generator.js
@@ -22,7 +22,7 @@ let shouldWarnAboutToHTMLDeprecation = ! Meteor.isProduction;
 
 export class Boilerplate {
   constructor(arch, manifest, options = {}) {
-    const { headTemplate, closeTemplate } = _getTemplate(arch);
+    const { headTemplate, closeTemplate } = getTemplate(arch);
     this.headTemplate = headTemplate;
     this.closeTemplate = closeTemplate;
     this.baseData = null;
@@ -154,12 +154,16 @@ export class Boilerplate {
 
 // Returns a template function that, when called, produces the boilerplate
 // html as a string.
-const _getTemplate = arch => {
-  if (arch === 'web.browser') {
+function getTemplate(arch) {
+  const prefix = arch.split(".", 2).join(".");
+
+  if (prefix === "web.browser") {
     return WebBrowserTemplate;
-  } else if (arch === 'web.cordova') {
-    return WebCordovaTemplate;
-  } else {
-    throw new Error('Unsupported arch: ' + arch);
   }
-};
+
+  if (prefix === "web.cordova") {
+    return WebCordovaTemplate;
+  }
+
+  throw new Error("Unsupported arch: " + arch);
+}
diff --git a/packages/caching-compiler/.npm/package/.gitignore b/packages/caching-compiler/.npm/package/.gitignore
deleted file mode 100644
index 3c3629e647..0000000000
--- a/packages/caching-compiler/.npm/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/caching-compiler/.npm/package/README b/packages/caching-compiler/.npm/package/README
deleted file mode 100644
index 3d492553a4..0000000000
--- a/packages/caching-compiler/.npm/package/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated
-when you change this package's NPM dependencies. Commit the files in this
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
-so that others run the same versions of sub-dependencies.
-
-You should NOT check in the node_modules directory that Meteor automatically
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/caching-compiler/.npm/package/npm-shrinkwrap.json b/packages/caching-compiler/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index f0ac52d443..0000000000
--- a/packages/caching-compiler/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz",
-      "integrity": "sha1-Nfhvg8WeBCHQmc2akdgnj7V4wA0="
-    },
-    "lru-cache": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
-      "integrity": "sha1-JnUZDM0bBwHsL2UqTQ09QA12wN0="
-    }
-  }
-}
diff --git a/packages/caching-compiler/caching-compiler.js b/packages/caching-compiler/caching-compiler.js
index 6c4abd335f..f8198b360c 100644
--- a/packages/caching-compiler/caching-compiler.js
+++ b/packages/caching-compiler/caching-compiler.js
@@ -2,9 +2,7 @@ const fs = Plugin.fs;
 const path = Plugin.path;
 const createHash = Npm.require('crypto').createHash;
 const assert = Npm.require('assert');
-const Future = Npm.require('fibers/future');
 const LRU = Npm.require('lru-cache');
-const async = Npm.require('async');
 
 // Base class for CachingCompiler and MultiFileCachingCompiler.
 CachingCompilerBase = class CachingCompilerBase {
@@ -283,14 +281,12 @@ CachingCompiler = class CachingCompiler extends CachingCompilerBase {
     const cacheMisses = [];
     const arches = this._cacheDebugEnabled && Object.create(null);
 
-    const future = new Future;
-    async.eachLimit(inputFiles, this._maxParallelism, (inputFile, cb) => {
+    return Promise.all(inputFiles.map(async (inputFile) => {
       if (arches) {
         arches[inputFile.getArch()] = 1;
       }
 
-      let error = null;
-      try {
+      const getResult = async () => {
         const cacheKey = this._deepHash(this.getCacheKey(inputFile));
         let compileResult = this._cache.get(cacheKey);
 
@@ -303,7 +299,7 @@ CachingCompiler = class CachingCompiler extends CachingCompilerBase {
 
         if (! compileResult) {
           cacheMisses.push(inputFile.getDisplayPath());
-          compileResult = this.compileOneFile(inputFile);
+          compileResult = await this.compileOneFile(inputFile);
 
           if (! compileResult) {
             // compileOneFile should have called inputFile.error.
@@ -316,17 +312,27 @@ CachingCompiler = class CachingCompiler extends CachingCompilerBase {
           this._writeCacheAsync(cacheKey, compileResult);
         }
 
-        this.addCompileResult(inputFile, compileResult);
-      } catch (e) {
-        error = e;
-      } finally {
-        cb(error);
-      }
-    }, future.resolver());
-    future.wait();
+        return compileResult;
+      };
+
+      if (this.compileOneFileLater &&
+          inputFile.supportsLazyCompilation &&
+          ! this._cacheDebugEnabled) {
+        await this.compileOneFileLater(inputFile, getResult);
+      } else {
+        const result = await getResult();
+        if (result) {
+          this.addCompileResult(inputFile, result);
+        }
+      }
+
+    })).then(() => {
+      if (! this._cacheDebugEnabled) {
+        return;
+      }
 
-    if (this._cacheDebugEnabled) {
       cacheMisses.sort();
+
       this._cacheDebug(
         `Ran (#${
           ++this._callCount
@@ -336,7 +342,7 @@ CachingCompiler = class CachingCompiler extends CachingCompilerBase {
           JSON.stringify(Object.keys(arches).sort())
         }`
       );
-    }
+    });
   }
 
   _cacheFilename(cacheKey) {
diff --git a/packages/caching-compiler/multi-file-caching-compiler.js b/packages/caching-compiler/multi-file-caching-compiler.js
index 6cb698cb34..2bc0f41b2c 100644
--- a/packages/caching-compiler/multi-file-caching-compiler.js
+++ b/packages/caching-compiler/multi-file-caching-compiler.js
@@ -1,7 +1,5 @@
 const path = Plugin.path;
-const Future = Npm.require('fibers/future');
 const LRU = Npm.require('lru-cache');
-const async = Npm.require('async');
 
 // MultiFileCachingCompiler is like CachingCompiler, but for implementing
 // languages which allow files to reference each other, such as CSS
@@ -92,20 +90,12 @@ extends CachingCompilerBase {
       cacheKeyMap.set(importPath, this._getCacheKeyWithPath(inputFile));
     });
 
-    const allProcessedFuture = new Future;
-    async.eachLimit(inputFiles, this._maxParallelism, (inputFile, cb) => {
+    return Promise.all(inputFiles.map(async (inputFile) => {
       if (arches) {
         arches[inputFile.getArch()] = 1;
       }
 
-      let error = null;
-      try {
-        // If this isn't a root, skip it (and definitely don't waste time
-        // looking for a cache file that won't be there).
-        if (!this.isRoot(inputFile)) {
-          return;
-        }
-
+      const getResult = async () => {
         const absoluteImportPath = this.getAbsoluteImportPath(inputFile);
         const cacheKey = cacheKeyMap.get(absoluteImportPath);
         let cacheEntry = this._cache.get(cacheKey);
@@ -119,13 +109,19 @@ extends CachingCompilerBase {
         if (! (cacheEntry && this._cacheEntryValid(cacheEntry, cacheKeyMap))) {
           cacheMisses.push(inputFile.getDisplayPath());
 
-          const compileOneFileReturn = this.compileOneFile(inputFile, allFiles);
+          const compileOneFileReturn =
+            await this.compileOneFile(inputFile, allFiles);
+
           if (! compileOneFileReturn) {
             // compileOneFile should have called inputFile.error.
-            //  We don't cache failures for now.
+            // We don't cache failures for now.
             return;
           }
-          const {compileResult, referencedImportPaths} = compileOneFileReturn;
+
+          const {
+            compileResult,
+            referencedImportPaths,
+          } = compileOneFileReturn;
 
           cacheEntry = {
             compileResult,
@@ -148,17 +144,27 @@ extends CachingCompilerBase {
           this._writeCacheAsync(cacheKey, cacheEntry);
         }
 
-        this.addCompileResult(inputFile, cacheEntry.compileResult);
-      } catch (e) {
-        error = e;
-      } finally {
-        cb(error);
-      }
-    }, allProcessedFuture.resolver());
-    allProcessedFuture.wait();
+        return cacheEntry.compileResult;
+      };
+
+      if (this.compileOneFileLater &&
+          inputFile.supportsLazyCompilation &&
+          ! this._cacheDebugEnabled) {
+        await this.compileOneFileLater(inputFile, getResult);
+      } else if (this.isRoot(inputFile)) {
+        const result = await getResult();
+        if (result) {
+          this.addCompileResult(inputFile, result);
+        }
+      }
+
+    })).then(() => {
+      if (! this._cacheDebugEnabled) {
+        return;
+      }
 
-    if (this._cacheDebugEnabled) {
       cacheMisses.sort();
+
       this._cacheDebug(
         `Ran (#${
           ++this._callCount
@@ -166,8 +172,9 @@ extends CachingCompilerBase {
           JSON.stringify(cacheMisses)
         } ${
           JSON.stringify(Object.keys(arches).sort())
-        }`);
-    }
+        }`
+      );
+    });
   }
 
   // Returns a hash that incorporates both this.getCacheKey(inputFile) and
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 37b38bfde1..987d9b7651 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,15 +1,10 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.12',
+  version: '1.2.0',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
 
-Npm.depends({
-  'lru-cache': '2.6.4',
-  'async': '1.4.0'
-});
-
 Package.onUse(function(api) {
   api.use(['ecmascript', 'random']);
   api.addFiles(['caching-compiler.js'], 'server');
diff --git a/packages/ddp-client/.npm/package/npm-shrinkwrap.json b/packages/ddp-client/.npm/package/npm-shrinkwrap.json
index 56bebb3f83..83ff1746e4 100644
--- a/packages/ddp-client/.npm/package/npm-shrinkwrap.json
+++ b/packages/ddp-client/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "lolex": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.4.0.tgz",
-      "integrity": "sha1-LycSsbwYDendzF06epbvPAuxYq0="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz",
+      "integrity": "sha512-mQuW55GhduF3ppo+ZRUTz1PRjEh1hS5BbqU7d8D0ez2OKxHDod7StPPeAVKisZR5aLkHZjdGWSL42LSONUJsZw=="
     }
   }
 }
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 7c2ebf8a8f..1605d90820 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Npm.depends({
-  lolex: '1.4.0'
+  lolex: '2.3.1'
 });
 
 Package.onUse((api) => {
diff --git a/packages/ddp-server/crossbar.js b/packages/ddp-server/crossbar.js
index a95060c488..6672059f99 100644
--- a/packages/ddp-server/crossbar.js
+++ b/packages/ddp-server/crossbar.js
@@ -11,6 +11,7 @@ DDPServer._Crossbar = function (options) {
   // keys 'trigger', 'callback'.  As a hack, the empty string means "no
   // collection".
   self.listenersByCollection = {};
+  self.listenersByCollectionCount = {};
   self.factPackage = options.factPackage || "livedata";
   self.factName = options.factName || null;
 };
@@ -48,8 +49,10 @@ _.extend(DDPServer._Crossbar.prototype, {
     var record = {trigger: EJSON.clone(trigger), callback: callback};
     if (! _.has(self.listenersByCollection, collection)) {
       self.listenersByCollection[collection] = {};
+      self.listenersByCollectionCount[collection] = 0;
     }
     self.listenersByCollection[collection][id] = record;
+    self.listenersByCollectionCount[collection]++;
 
     if (self.factName && Package['facts-base']) {
       Package['facts-base'].Facts.incrementServerFact(
@@ -63,8 +66,10 @@ _.extend(DDPServer._Crossbar.prototype, {
             self.factPackage, self.factName, -1);
         }
         delete self.listenersByCollection[collection][id];
-        if (_.isEmpty(self.listenersByCollection[collection])) {
+        self.listenersByCollectionCount[collection]--;
+        if (self.listenersByCollectionCount[collection] === 0) {
           delete self.listenersByCollection[collection];
+          delete self.listenersByCollectionCount[collection];
         }
       }
     };
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index adf1a4be58..c738ca316b 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '2.1.2',
+  version: '2.2.0',
   documentation: null
 });
 
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index d34aef856f..7b71af3f18 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -121,11 +121,15 @@ var fetchURL = require("./common.js").fetchURL;
 
 function fetchMissing(missingTree) {
   return new Promise(function (resolve, reject) {
-    // Always match the protocol (http or https) and the domain:port of
-    // the current page.
-    var url = "//" + location.host + fetchURL;
-
-    HTTP.call("POST", url, {
+    // If the hostname of the URL returned by Meteor.absoluteUrl differs
+    // from location.host, then we'll be making a cross-origin request
+    // here, but that's fine because the dynamic-import server sets
+    // appropriate CORS headers to enable fetching dynamic modules from
+    // any origin. Browsers that check CORS do so by sending an additional
+    // preflight OPTIONS request, which may add latency to the first
+    // dynamic import() request, so it's a good idea for ROOT_URL to match
+    // location.host if possible, though not strictly necessary.
+    HTTP.call("POST", Meteor.absoluteUrl(fetchURL), {
       query: secretKey ? "key=" + secretKey : void 0,
       data: missingTree
     }, function (error, result) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 0249edb785..dd99bbd177 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.3.0",
+  version: "0.4.1",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
@@ -12,6 +12,7 @@ Package.onUse(function (api) {
   api.use("modules");
   api.use("promise");
   api.use("http");
+  api.use("modern-browsers");
 
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
diff --git a/packages/dynamic-import/server.js b/packages/dynamic-import/server.js
index 5c8fd7e78e..ed29b51767 100644
--- a/packages/dynamic-import/server.js
+++ b/packages/dynamic-import/server.js
@@ -7,6 +7,7 @@ const {
   normalize: pathNormalize,
 } = require("path");
 const { fetchURL } = require("./common.js");
+const { isModern } = require("meteor/modern-browsers");
 const hasOwn = Object.prototype.hasOwnProperty;
 
 require("./security.js");
@@ -61,20 +62,41 @@ function randomId(n) {
 }
 
 function middleware(request, response) {
-  assert.strictEqual(request.method, "POST");
-  const chunks = [];
-  request.on("data", chunk => chunks.push(chunk));
-  request.on("end", () => {
-    response.setHeader("Content-Type", "application/json");
-    response.end(JSON.stringify(readTree(
-      JSON.parse(Buffer.concat(chunks)),
-      getPlatform(request)
-    )));
-  });
+  // Allow dynamic import() requests from any origin.
+  response.setHeader("Access-Control-Allow-Origin", "*");
+
+  if (request.method === "OPTIONS") {
+    const acrh = request.headers["access-control-request-headers"];
+    response.setHeader(
+      "Access-Control-Allow-Headers",
+      typeof acrh === "string" ? acrh : "*"
+    );
+    response.setHeader("Access-Control-Allow-Methods", "POST");
+    response.end();
+  } else if (request.method === "POST") {
+    const chunks = [];
+    request.on("data", chunk => chunks.push(chunk));
+    request.on("end", () => {
+      response.setHeader("Content-Type", "application/json");
+      response.end(JSON.stringify(readTree(
+        JSON.parse(Buffer.concat(chunks)),
+        getPlatform(request)
+      ), null, 2));
+    });
+  } else {
+    response.writeHead(405, {
+      "Cache-Control": "no-cache"
+    });
+    response.end(`method ${request.method} not allowed`);
+  }
 }
 
 function getPlatform(request) {
-  let platform = "web.browser";
+  const { identifyBrowser } = Package.webapp.WebAppInternals;
+  const browser = identifyBrowser(request.headers["user-agent"]);
+  let platform = isModern(browser)
+    ? "web.browser"
+    : "web.browser.legacy";
 
   // If the __dynamicImport request includes a secret key, and it matches
   // dynamicImportInfo[platform].key, use platform instead of the default
diff --git a/packages/ecmascript-runtime-client/runtime.js b/packages/ecmascript-runtime-client/legacy.js
similarity index 98%
rename from packages/ecmascript-runtime-client/runtime.js
rename to packages/ecmascript-runtime-client/legacy.js
index ca34e191b7..51eded6eeb 100644
--- a/packages/ecmascript-runtime-client/runtime.js
+++ b/packages/ecmascript-runtime-client/legacy.js
@@ -64,3 +64,5 @@ require('core-js/modules/es6.number.parse-int');
 // Typed Arrays
 require('core-js/modules/es6.typed.uint8-array');
 require('core-js/modules/es6.typed.uint32-array');
+
+require("./modern.js");
diff --git a/packages/ecmascript-runtime-client/modern.js b/packages/ecmascript-runtime-client/modern.js
new file mode 100644
index 0000000000..0453acf40e
--- /dev/null
+++ b/packages/ecmascript-runtime-client/modern.js
@@ -0,0 +1,11 @@
+require("core-js/modules/es6.object.is");
+require("core-js/modules/es6.function.name");
+require("core-js/modules/es6.number.is-finite");
+require("core-js/modules/es6.number.is-nan");
+require("core-js/modules/es7.array.flatten");
+require("core-js/modules/es7.array.flat-map");
+require("core-js/modules/es7.object.values");
+require("core-js/modules/es7.object.entries");
+require("core-js/modules/es7.object.get-own-property-descriptors");
+require("core-js/modules/es7.string.pad-start");
+require("core-js/modules/es7.string.pad-end");
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index fbfb5bd71c..d70ddb9cce 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,16 +1,26 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.6.2",
+  version: "0.7.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
 });
 
 Package.onUse(function(api) {
-  api.use("modules", "client");
-  api.use("promise", "client");
-  api.mainModule("runtime.js", "client");
-  api.export("Symbol", "client");
-  api.export("Map", "client");
-  api.export("Set", "client");
+  // If the es5-shim package is installed, make sure it loads before
+  // ecmascript-runtime-server, since the runtime uses some ES5 APIs like
+  // Object.defineProperties that are buggy in older browsers.
+  api.use("es5-shim", { weak: true });
+
+  api.use("modules");
+  api.use("promise");
+  api.use("modern-browsers");
+
+  api.mainModule("versions.js", "server");
+  api.mainModule("modern.js", "client");
+
+  api.mainModule("legacy.js", "legacy");
+  api.export("Symbol", "legacy");
+  api.export("Map", "legacy");
+  api.export("Set", "legacy");
 });
diff --git a/packages/ecmascript-runtime-client/versions.js b/packages/ecmascript-runtime-client/versions.js
new file mode 100644
index 0000000000..1bced38a73
--- /dev/null
+++ b/packages/ecmascript-runtime-client/versions.js
@@ -0,0 +1,18 @@
+const {
+  setMinimumBrowserVersions,
+} = require("meteor/modern-browsers");
+
+setMinimumBrowserVersions({
+  chrome: 49,
+  edge: 12,
+  // Since there is no IE11, this effectively excludes Internet Explorer
+  // (pre-Edge) from the modern classification. #9818 #9839
+  ie: 12,
+  firefox: 45,
+  mobileSafari: 10,
+  opera: 38,
+  safari: 10,
+  // Electron 1.6.0+ matches Chromium 55, per
+  // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
+  electron: [1, 6],
+}, module.id);
diff --git a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
index a06fe210bc..f2b94f68ee 100644
--- a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
+++ b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     }
   }
 }
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index c5ab694565..c9709f5bc7 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,16 +1,16 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.5.0",
+  version: "0.7.0",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "core-js": "2.4.1"
+  "core-js": "2.5.1"
 });
 
 Package.onUse(function(api) {
-  api.use("modules", "server");
+  api.use("modules");
   api.mainModule("runtime.js", "server");
 });
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 1552886ba0..6f2e54e0f0 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.5.0",
+  version: "0.7.0",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
 });
 
 Package.onUse(function(api) {
-  api.imply("ecmascript-runtime-client", "client");
+  api.imply("ecmascript-runtime-client");
   api.imply("ecmascript-runtime-server", "server");
 });
 
diff --git a/packages/ecmascript/ecmascript.js b/packages/ecmascript/ecmascript.js
index 62212909da..ac258d6283 100644
--- a/packages/ecmascript/ecmascript.js
+++ b/packages/ecmascript/ecmascript.js
@@ -1,7 +1,8 @@
 ECMAScript = {
   compileForShell(command) {
     const babelOptions = Babel.getDefaultOptions();
-    babelOptions.sourceMap = false;
+    delete babelOptions.sourceMap;
+    delete babelOptions.sourceMaps;
     babelOptions.ast = false;
     return Babel.compile(command, babelOptions).code;
   }
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 27f4c3279c..63c03acaf7 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.10.8',
+  version: '0.11.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ecmascript/runtime-tests.js b/packages/ecmascript/runtime-tests.js
index 556f011d4f..4ff00aa91e 100644
--- a/packages/ecmascript/runtime-tests.js
+++ b/packages/ecmascript/runtime-tests.js
@@ -2,30 +2,24 @@ const isNode8OrLater = Meteor.isServer &&
   parseInt(process.versions.node) >= 8;
 
 Tinytest.add("ecmascript - runtime - template literals", (test) => {
-  function dump(pieces) {
-    var copy = {};
-    // Can't use _.extend({}, pieces) because es5-shim adds enumerable
-    // methods to Array.prototype, and _.extend has no own property check.
-    _.each(_.keys(pieces), key => copy[key] = pieces[key]);
-    return [copy, _.toArray(arguments).slice(1)];
+  function dump(strings, ...expressions) {
+    const copy = Object.create(null);
+    Object.assign(copy, strings);
+    copy.raw = strings.raw;
+    return [copy, expressions];
   };
-  const foo = 'B';
-  // uses `babelHelpers.taggedTemplateLiteralLoose`
-  test.equal(`\u0041${foo}C`, 'ABC');
 
-  const expected = [{
-    0: 'A',
-    1: 'C',
-    raw: ['\\u0041', 'C']
+  const foo = "B";
+
+  test.equal(`\u0041${foo}C`, "ABC");
+
+  test.equal(dump`\u0041${foo}C`, [{
+    0: "A",
+    1: "C",
+    raw: ["\\u0041", "C"]
   }, [
-    'B'
-  ]];
-
-  if (isNode8OrLater) {
-    delete expected[0].raw;
-  }
-
-  test.equal(dump`\u0041${foo}C`, expected);
+    "B"
+  ]]);
 });
 
 Tinytest.add("ecmascript - runtime - classes - basic", (test) => {
diff --git a/packages/es5-shim/client.js b/packages/es5-shim/client.js
new file mode 100644
index 0000000000..aa0d54b091
--- /dev/null
+++ b/packages/es5-shim/client.js
@@ -0,0 +1,5 @@
+require("./import_globals.js");
+require("es5-shim/es5-shim.js");
+require("es5-shim/es5-sham.js");
+require("./console.js");
+require("./export_globals.js");
diff --git a/packages/es5-shim/es5-shim-sham.js b/packages/es5-shim/es5-shim-sham.js
deleted file mode 100644
index 9134f10840..0000000000
--- a/packages/es5-shim/es5-shim-sham.js
+++ /dev/null
@@ -1,2629 +0,0 @@
-/*!
- * https://github.com/es-shims/es5-shim
- * @license es5-shim Copyright 2009-2015 by contributors, MIT License
- * see https://github.com/es-shims/es5-shim/blob/master/LICENSE
- * @version 4.5.9
- */
-
-// vim: ts=4 sts=4 sw=4 expandtab
-
-// Add semicolon to prevent IIFE from being passed as argument to concatenated code.
-;
-
-// UMD (Universal Module Definition)
-// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js
-(function (root, factory) {
-    'use strict';
-
-    /* global define, exports, module */
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(factory);
-    } else if (typeof exports === 'object') {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like enviroments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        // Browser globals (root is window)
-        root.returnExports = factory();
-    }
-}(this, function () {
-    /**
-     * Brings an environment as close to ECMAScript 5 compliance
-     * as is possible with the facilities of erstwhile engines.
-     *
-     * Annotated ES5: http://es5.github.com/ (specific links below)
-     * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
-     * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/
-     */
-
-    // Shortcut to an often accessed properties, in order to avoid multiple
-    // dereference that costs universally. This also holds a reference to known-good
-    // functions.
-    var $Array = Array;
-    var ArrayPrototype = $Array.prototype;
-    var $Object = Object;
-    var ObjectPrototype = $Object.prototype;
-    var $Function = Function;
-    var FunctionPrototype = $Function.prototype;
-    var $String = String;
-    var StringPrototype = $String.prototype;
-    var $Number = Number;
-    var NumberPrototype = $Number.prototype;
-    var array_slice = ArrayPrototype.slice;
-    var array_splice = ArrayPrototype.splice;
-    var array_push = ArrayPrototype.push;
-    var array_unshift = ArrayPrototype.unshift;
-    var array_concat = ArrayPrototype.concat;
-    var array_join = ArrayPrototype.join;
-    var call = FunctionPrototype.call;
-    var apply = FunctionPrototype.apply;
-    var max = Math.max;
-    var min = Math.min;
-
-    // Having a toString local variable name breaks in Opera so use to_string.
-    var to_string = ObjectPrototype.toString;
-
-    /* global Symbol */
-    /* eslint-disable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
-    var hasToStringTag = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-    var isCallable; /* inlined from https://npmjs.com/is-callable */ var fnToStr = Function.prototype.toString, constructorRegex = /^\s*class /, isES6ClassFn = function isES6ClassFn(value) { try { var fnStr = fnToStr.call(value); var singleStripped = fnStr.replace(/\/\/.*\n/g, ''); var multiStripped = singleStripped.replace(/\/\*[.\s\S]*\*\//g, ''); var spaceStripped = multiStripped.replace(/\n/mg, ' ').replace(/ {2}/g, ' '); return constructorRegex.test(spaceStripped); } catch (e) { return false; /* not a function */ } }, tryFunctionObject = function tryFunctionObject(value) { try { if (isES6ClassFn(value)) { return false; } fnToStr.call(value); return true; } catch (e) { return false; } }, fnClass = '[object Function]', genClass = '[object GeneratorFunction]', isCallable = function isCallable(value) { if (!value) { return false; } if (typeof value !== 'function' && typeof value !== 'object') { return false; } if (hasToStringTag) { return tryFunctionObject(value); } if (isES6ClassFn(value)) { return false; } var strClass = to_string.call(value); return strClass === fnClass || strClass === genClass; };
-
-    var isRegex; /* inlined from https://npmjs.com/is-regex */ var regexExec = RegExp.prototype.exec, tryRegexExec = function tryRegexExec(value) { try { regexExec.call(value); return true; } catch (e) { return false; } }, regexClass = '[object RegExp]'; isRegex = function isRegex(value) { if (typeof value !== 'object') { return false; } return hasToStringTag ? tryRegexExec(value) : to_string.call(value) === regexClass; };
-    var isString; /* inlined from https://npmjs.com/is-string */ var strValue = String.prototype.valueOf, tryStringObject = function tryStringObject(value) { try { strValue.call(value); return true; } catch (e) { return false; } }, stringClass = '[object String]'; isString = function isString(value) { if (typeof value === 'string') { return true; } if (typeof value !== 'object') { return false; } return hasToStringTag ? tryStringObject(value) : to_string.call(value) === stringClass; };
-    /* eslint-enable one-var-declaration-per-line, no-redeclare, max-statements-per-line */
-
-    /* inlined from http://npmjs.com/define-properties */
-    var supportsDescriptors = $Object.defineProperty && (function () {
-        try {
-            var obj = {};
-            $Object.defineProperty(obj, 'x', { enumerable: false, value: obj });
-            for (var _ in obj) { // jscs:ignore disallowUnusedVariables
-                return false;
-            }
-            return obj.x === obj;
-        } catch (e) { /* this is ES3 */
-            return false;
-        }
-    }());
-    var defineProperties = (function (has) {
-        // Define configurable, writable, and non-enumerable props
-        // if they don't exist.
-        var defineProperty;
-        if (supportsDescriptors) {
-            defineProperty = function (object, name, method, forceAssign) {
-                if (!forceAssign && (name in object)) {
-                    return;
-                }
-                $Object.defineProperty(object, name, {
-                    configurable: true,
-                    enumerable: false,
-                    writable: true,
-                    value: method
-                });
-            };
-        } else {
-            defineProperty = function (object, name, method, forceAssign) {
-                if (!forceAssign && (name in object)) {
-                    return;
-                }
-                object[name] = method;
-            };
-        }
-        return function defineProperties(object, map, forceAssign) {
-            for (var name in map) {
-                if (has.call(map, name)) {
-                    defineProperty(object, name, map[name], forceAssign);
-                }
-            }
-        };
-    }(ObjectPrototype.hasOwnProperty));
-
-    //
-    // Util
-    // ======
-    //
-
-    /* replaceable with https://npmjs.com/package/es-abstract /helpers/isPrimitive */
-    var isPrimitive = function isPrimitive(input) {
-        var type = typeof input;
-        return input === null || (type !== 'object' && type !== 'function');
-    };
-
-    var isActualNaN = $Number.isNaN || function isActualNaN(x) {
-        return x !== x;
-    };
-
-    var ES = {
-        // ES5 9.4
-        // http://es5.github.com/#x9.4
-        // http://jsperf.com/to-integer
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToInteger */
-        ToInteger: function ToInteger(num) {
-            var n = +num;
-            if (isActualNaN(n)) {
-                n = 0;
-            } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-                n = (n > 0 || -1) * Math.floor(Math.abs(n));
-            }
-            return n;
-        },
-
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToPrimitive */
-        ToPrimitive: function ToPrimitive(input) {
-            var val, valueOf, toStr;
-            if (isPrimitive(input)) {
-                return input;
-            }
-            valueOf = input.valueOf;
-            if (isCallable(valueOf)) {
-                val = valueOf.call(input);
-                if (isPrimitive(val)) {
-                    return val;
-                }
-            }
-            toStr = input.toString;
-            if (isCallable(toStr)) {
-                val = toStr.call(input);
-                if (isPrimitive(val)) {
-                    return val;
-                }
-            }
-            throw new TypeError();
-        },
-
-        // ES5 9.9
-        // http://es5.github.com/#x9.9
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToObject */
-        ToObject: function (o) {
-            if (o == null) { // this matches both null and undefined
-                throw new TypeError("can't convert " + o + ' to object');
-            }
-            return $Object(o);
-        },
-
-        /* replaceable with https://npmjs.com/package/es-abstract ES5.ToUint32 */
-        ToUint32: function ToUint32(x) {
-            return x >>> 0;
-        }
-    };
-
-    //
-    // Function
-    // ========
-    //
-
-    // ES-5 15.3.4.5
-    // http://es5.github.com/#x15.3.4.5
-
-    var Empty = function Empty() {};
-
-    defineProperties(FunctionPrototype, {
-        bind: function bind(that) { // .length is 1
-            // 1. Let Target be the this value.
-            var target = this;
-            // 2. If IsCallable(Target) is false, throw a TypeError exception.
-            if (!isCallable(target)) {
-                throw new TypeError('Function.prototype.bind called on incompatible ' + target);
-            }
-            // 3. Let A be a new (possibly empty) internal list of all of the
-            //   argument values provided after thisArg (arg1, arg2 etc), in order.
-            // XXX slicedArgs will stand in for "A" if used
-            var args = array_slice.call(arguments, 1); // for normal call
-            // 4. Let F be a new native ECMAScript object.
-            // 11. Set the [[Prototype]] internal property of F to the standard
-            //   built-in Function prototype object as specified in 15.3.3.1.
-            // 12. Set the [[Call]] internal property of F as described in
-            //   15.3.4.5.1.
-            // 13. Set the [[Construct]] internal property of F as described in
-            //   15.3.4.5.2.
-            // 14. Set the [[HasInstance]] internal property of F as described in
-            //   15.3.4.5.3.
-            var bound;
-            var binder = function () {
-
-                if (this instanceof bound) {
-                    // 15.3.4.5.2 [[Construct]]
-                    // When the [[Construct]] internal method of a function object,
-                    // F that was created using the bind function is called with a
-                    // list of arguments ExtraArgs, the following steps are taken:
-                    // 1. Let target be the value of F's [[TargetFunction]]
-                    //   internal property.
-                    // 2. If target has no [[Construct]] internal method, a
-                    //   TypeError exception is thrown.
-                    // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                    //   property.
-                    // 4. Let args be a new list containing the same values as the
-                    //   list boundArgs in the same order followed by the same
-                    //   values as the list ExtraArgs in the same order.
-                    // 5. Return the result of calling the [[Construct]] internal
-                    //   method of target providing args as the arguments.
-
-                    var result = apply.call(
-                        target,
-                        this,
-                        array_concat.call(args, array_slice.call(arguments))
-                    );
-                    if ($Object(result) === result) {
-                        return result;
-                    }
-                    return this;
-
-                } else {
-                    // 15.3.4.5.1 [[Call]]
-                    // When the [[Call]] internal method of a function object, F,
-                    // which was created using the bind function is called with a
-                    // this value and a list of arguments ExtraArgs, the following
-                    // steps are taken:
-                    // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                    //   property.
-                    // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                    //   property.
-                    // 3. Let target be the value of F's [[TargetFunction]] internal
-                    //   property.
-                    // 4. Let args be a new list containing the same values as the
-                    //   list boundArgs in the same order followed by the same
-                    //   values as the list ExtraArgs in the same order.
-                    // 5. Return the result of calling the [[Call]] internal method
-                    //   of target providing boundThis as the this value and
-                    //   providing args as the arguments.
-
-                    // equiv: target.call(this, ...boundArgs, ...args)
-                    return apply.call(
-                        target,
-                        that,
-                        array_concat.call(args, array_slice.call(arguments))
-                    );
-
-                }
-
-            };
-
-            // 15. If the [[Class]] internal property of Target is "Function", then
-            //     a. Let L be the length property of Target minus the length of A.
-            //     b. Set the length own property of F to either 0 or L, whichever is
-            //       larger.
-            // 16. Else set the length own property of F to 0.
-
-            var boundLength = max(0, target.length - args.length);
-
-            // 17. Set the attributes of the length own property of F to the values
-            //   specified in 15.3.5.1.
-            var boundArgs = [];
-            for (var i = 0; i < boundLength; i++) {
-                array_push.call(boundArgs, '$' + i);
-            }
-
-            // XXX Build a dynamic function with desired amount of arguments is the only
-            // way to set the length property of a function.
-            // In environments where Content Security Policies enabled (Chrome extensions,
-            // for ex.) all use of eval or Function costructor throws an exception.
-            // However in all of these environments Function.prototype.bind exists
-            // and so this code will never be executed.
-            bound = $Function('binder', 'return function (' + array_join.call(boundArgs, ',') + '){ return binder.apply(this, arguments); }')(binder);
-
-            if (target.prototype) {
-                Empty.prototype = target.prototype;
-                bound.prototype = new Empty();
-                // Clean up dangling references.
-                Empty.prototype = null;
-            }
-
-            // TODO
-            // 18. Set the [[Extensible]] internal property of F to true.
-
-            // TODO
-            // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-            // 20. Call the [[DefineOwnProperty]] internal method of F with
-            //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-            //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
-            //   false.
-            // 21. Call the [[DefineOwnProperty]] internal method of F with
-            //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
-            //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-            //   and false.
-
-            // TODO
-            // NOTE Function objects created using Function.prototype.bind do not
-            // have a prototype property or the [[Code]], [[FormalParameters]], and
-            // [[Scope]] internal properties.
-            // XXX can't delete prototype in pure-js.
-
-            // 22. Return F.
-            return bound;
-        }
-    });
-
-    // _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-    // use it in defining shortcuts.
-    var owns = call.bind(ObjectPrototype.hasOwnProperty);
-    var toStr = call.bind(ObjectPrototype.toString);
-    var arraySlice = call.bind(array_slice);
-    var arraySliceApply = apply.bind(array_slice);
-    var strSlice = call.bind(StringPrototype.slice);
-    var strSplit = call.bind(StringPrototype.split);
-    var strIndexOf = call.bind(StringPrototype.indexOf);
-    var pushCall = call.bind(array_push);
-    var isEnum = call.bind(ObjectPrototype.propertyIsEnumerable);
-    var arraySort = call.bind(ArrayPrototype.sort);
-
-    //
-    // Array
-    // =====
-    //
-
-    var isArray = $Array.isArray || function isArray(obj) {
-        return toStr(obj) === '[object Array]';
-    };
-
-    // ES5 15.4.4.12
-    // http://es5.github.com/#x15.4.4.13
-    // Return len+argCount.
-    // [bugfix, ielt8]
-    // IE < 8 bug: [].unshift(0) === undefined but should be "1"
-    var hasUnshiftReturnValueBug = [].unshift(0) !== 1;
-    defineProperties(ArrayPrototype, {
-        unshift: function () {
-            array_unshift.apply(this, arguments);
-            return this.length;
-        }
-    }, hasUnshiftReturnValueBug);
-
-    // ES5 15.4.3.2
-    // http://es5.github.com/#x15.4.3.2
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-    defineProperties($Array, { isArray: isArray });
-
-    // The IsCallable() check in the Array functions
-    // has been replaced with a strict check on the
-    // internal class of the object to trap cases where
-    // the provided function was actually a regular
-    // expression literal, which in V8 and
-    // JavaScriptCore is a typeof "function".  Only in
-    // V8 are regular expression literals permitted as
-    // reduce parameters, so it is desirable in the
-    // general case for the shim to match the more
-    // strict and common behavior of rejecting regular
-    // expressions.
-
-    // ES5 15.4.4.18
-    // http://es5.github.com/#x15.4.4.18
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-
-    // Check failure of by-index access of string characters (IE < 9)
-    // and failure of `0 in boxedString` (Rhino)
-    var boxedString = $Object('a');
-    var splitString = boxedString[0] !== 'a' || !(0 in boxedString);
-
-    var properlyBoxesContext = function properlyBoxed(method) {
-        // Check node 0.6.21 bug where third parameter is not boxed
-        var properlyBoxesNonStrict = true;
-        var properlyBoxesStrict = true;
-        var threwException = false;
-        if (method) {
-            try {
-                method.call('foo', function (_, __, context) {
-                    if (typeof context !== 'object') {
-                        properlyBoxesNonStrict = false;
-                    }
-                });
-
-                method.call([1], function () {
-                    'use strict';
-
-                    properlyBoxesStrict = typeof this === 'string';
-                }, 'x');
-            } catch (e) {
-                threwException = true;
-            }
-        }
-        return !!method && !threwException && properlyBoxesNonStrict && properlyBoxesStrict;
-    };
-
-    defineProperties(ArrayPrototype, {
-        forEach: function forEach(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var i = -1;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.forEach callback must be a function');
-            }
-
-            while (++i < length) {
-                if (i in self) {
-                    // Invoke the callback function with call, passing arguments:
-                    // context, property value, property key, thisArg object
-                    if (typeof T === 'undefined') {
-                        callbackfn(self[i], i, object);
-                    } else {
-                        callbackfn.call(T, self[i], i, object);
-                    }
-                }
-            }
-        }
-    }, !properlyBoxesContext(ArrayPrototype.forEach));
-
-    // ES5 15.4.4.19
-    // http://es5.github.com/#x15.4.4.19
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-    defineProperties(ArrayPrototype, {
-        map: function map(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var result = $Array(length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.map callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self) {
-                    if (typeof T === 'undefined') {
-                        result[i] = callbackfn(self[i], i, object);
-                    } else {
-                        result[i] = callbackfn.call(T, self[i], i, object);
-                    }
-                }
-            }
-            return result;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.map));
-
-    // ES5 15.4.4.20
-    // http://es5.github.com/#x15.4.4.20
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-    defineProperties(ArrayPrototype, {
-        filter: function filter(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var result = [];
-            var value;
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.filter callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self) {
-                    value = self[i];
-                    if (typeof T === 'undefined' ? callbackfn(value, i, object) : callbackfn.call(T, value, i, object)) {
-                        pushCall(result, value);
-                    }
-                }
-            }
-            return result;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.filter));
-
-    // ES5 15.4.4.16
-    // http://es5.github.com/#x15.4.4.16
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-    defineProperties(ArrayPrototype, {
-        every: function every(callbackfn/*, thisArg*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.every callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self && !(typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.every));
-
-    // ES5 15.4.4.17
-    // http://es5.github.com/#x15.4.4.17
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-    defineProperties(ArrayPrototype, {
-        some: function some(callbackfn/*, thisArg */) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-            var T;
-            if (arguments.length > 1) {
-                T = arguments[1];
-            }
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.some callback must be a function');
-            }
-
-            for (var i = 0; i < length; i++) {
-                if (i in self && (typeof T === 'undefined' ? callbackfn(self[i], i, object) : callbackfn.call(T, self[i], i, object))) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }, !properlyBoxesContext(ArrayPrototype.some));
-
-    // ES5 15.4.4.21
-    // http://es5.github.com/#x15.4.4.21
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-    var reduceCoercesToObject = false;
-    if (ArrayPrototype.reduce) {
-        reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) {
-            return list;
-        }) === 'object';
-    }
-    defineProperties(ArrayPrototype, {
-        reduce: function reduce(callbackfn/*, initialValue*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.reduce callback must be a function');
-            }
-
-            // no value to return if no initial value and an empty array
-            if (length === 0 && arguments.length === 1) {
-                throw new TypeError('reduce of empty array with no initial value');
-            }
-
-            var i = 0;
-            var result;
-            if (arguments.length >= 2) {
-                result = arguments[1];
-            } else {
-                do {
-                    if (i in self) {
-                        result = self[i++];
-                        break;
-                    }
-
-                    // if array contains no values, no initial value to return
-                    if (++i >= length) {
-                        throw new TypeError('reduce of empty array with no initial value');
-                    }
-                } while (true);
-            }
-
-            for (; i < length; i++) {
-                if (i in self) {
-                    result = callbackfn(result, self[i], i, object);
-                }
-            }
-
-            return result;
-        }
-    }, !reduceCoercesToObject);
-
-    // ES5 15.4.4.22
-    // http://es5.github.com/#x15.4.4.22
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-    var reduceRightCoercesToObject = false;
-    if (ArrayPrototype.reduceRight) {
-        reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) {
-            return list;
-        }) === 'object';
-    }
-    defineProperties(ArrayPrototype, {
-        reduceRight: function reduceRight(callbackfn/*, initial*/) {
-            var object = ES.ToObject(this);
-            var self = splitString && isString(this) ? strSplit(this, '') : object;
-            var length = ES.ToUint32(self.length);
-
-            // If no callback function or if callback is not a callable function
-            if (!isCallable(callbackfn)) {
-                throw new TypeError('Array.prototype.reduceRight callback must be a function');
-            }
-
-            // no value to return if no initial value, empty array
-            if (length === 0 && arguments.length === 1) {
-                throw new TypeError('reduceRight of empty array with no initial value');
-            }
-
-            var result;
-            var i = length - 1;
-            if (arguments.length >= 2) {
-                result = arguments[1];
-            } else {
-                do {
-                    if (i in self) {
-                        result = self[i--];
-                        break;
-                    }
-
-                    // if array contains no values, no initial value to return
-                    if (--i < 0) {
-                        throw new TypeError('reduceRight of empty array with no initial value');
-                    }
-                } while (true);
-            }
-
-            if (i < 0) {
-                return result;
-            }
-
-            do {
-                if (i in self) {
-                    result = callbackfn(result, self[i], i, object);
-                }
-            } while (i--);
-
-            return result;
-        }
-    }, !reduceRightCoercesToObject);
-
-    // ES5 15.4.4.14
-    // http://es5.github.com/#x15.4.4.14
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-    var hasFirefox2IndexOfBug = ArrayPrototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
-    defineProperties(ArrayPrototype, {
-        indexOf: function indexOf(searchElement/*, fromIndex */) {
-            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
-            var length = ES.ToUint32(self.length);
-
-            if (length === 0) {
-                return -1;
-            }
-
-            var i = 0;
-            if (arguments.length > 1) {
-                i = ES.ToInteger(arguments[1]);
-            }
-
-            // handle negative indices
-            i = i >= 0 ? i : max(0, length + i);
-            for (; i < length; i++) {
-                if (i in self && self[i] === searchElement) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }, hasFirefox2IndexOfBug);
-
-    // ES5 15.4.4.15
-    // http://es5.github.com/#x15.4.4.15
-    // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-    var hasFirefox2LastIndexOfBug = ArrayPrototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;
-    defineProperties(ArrayPrototype, {
-        lastIndexOf: function lastIndexOf(searchElement/*, fromIndex */) {
-            var self = splitString && isString(this) ? strSplit(this, '') : ES.ToObject(this);
-            var length = ES.ToUint32(self.length);
-
-            if (length === 0) {
-                return -1;
-            }
-            var i = length - 1;
-            if (arguments.length > 1) {
-                i = min(i, ES.ToInteger(arguments[1]));
-            }
-            // handle negative indices
-            i = i >= 0 ? i : length - Math.abs(i);
-            for (; i >= 0; i--) {
-                if (i in self && searchElement === self[i]) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }, hasFirefox2LastIndexOfBug);
-
-    // ES5 15.4.4.12
-    // http://es5.github.com/#x15.4.4.12
-    var spliceNoopReturnsEmptyArray = (function () {
-        var a = [1, 2];
-        var result = a.splice();
-        return a.length === 2 && isArray(result) && result.length === 0;
-    }());
-    defineProperties(ArrayPrototype, {
-        // Safari 5.0 bug where .splice() returns undefined
-        splice: function splice(start, deleteCount) {
-            if (arguments.length === 0) {
-                return [];
-            } else {
-                return array_splice.apply(this, arguments);
-            }
-        }
-    }, !spliceNoopReturnsEmptyArray);
-
-    var spliceWorksWithEmptyObject = (function () {
-        var obj = {};
-        ArrayPrototype.splice.call(obj, 0, 0, 1);
-        return obj.length === 1;
-    }());
-    defineProperties(ArrayPrototype, {
-        splice: function splice(start, deleteCount) {
-            if (arguments.length === 0) {
-                return [];
-            }
-            var args = arguments;
-            this.length = max(ES.ToInteger(this.length), 0);
-            if (arguments.length > 0 && typeof deleteCount !== 'number') {
-                args = arraySlice(arguments);
-                if (args.length < 2) {
-                    pushCall(args, this.length - start);
-                } else {
-                    args[1] = ES.ToInteger(deleteCount);
-                }
-            }
-            return array_splice.apply(this, args);
-        }
-    }, !spliceWorksWithEmptyObject);
-    var spliceWorksWithLargeSparseArrays = (function () {
-        // Per https://github.com/es-shims/es5-shim/issues/295
-        // Safari 7/8 breaks with sparse arrays of size 1e5 or greater
-        var arr = new $Array(1e5);
-        // note: the index MUST be 8 or larger or the test will false pass
-        arr[8] = 'x';
-        arr.splice(1, 1);
-        // note: this test must be defined *after* the indexOf shim
-        // per https://github.com/es-shims/es5-shim/issues/313
-        return arr.indexOf('x') === 7;
-    }());
-    var spliceWorksWithSmallSparseArrays = (function () {
-        // Per https://github.com/es-shims/es5-shim/issues/295
-        // Opera 12.15 breaks on this, no idea why.
-        var n = 256;
-        var arr = [];
-        arr[n] = 'a';
-        arr.splice(n + 1, 0, 'b');
-        return arr[n] === 'a';
-    }());
-    defineProperties(ArrayPrototype, {
-        splice: function splice(start, deleteCount) {
-            var O = ES.ToObject(this);
-            var A = [];
-            var len = ES.ToUint32(O.length);
-            var relativeStart = ES.ToInteger(start);
-            var actualStart = relativeStart < 0 ? max((len + relativeStart), 0) : min(relativeStart, len);
-            var actualDeleteCount = min(max(ES.ToInteger(deleteCount), 0), len - actualStart);
-
-            var k = 0;
-            var from;
-            while (k < actualDeleteCount) {
-                from = $String(actualStart + k);
-                if (owns(O, from)) {
-                    A[k] = O[from];
-                }
-                k += 1;
-            }
-
-            var items = arraySlice(arguments, 2);
-            var itemCount = items.length;
-            var to;
-            if (itemCount < actualDeleteCount) {
-                k = actualStart;
-                var maxK = len - actualDeleteCount;
-                while (k < maxK) {
-                    from = $String(k + actualDeleteCount);
-                    to = $String(k + itemCount);
-                    if (owns(O, from)) {
-                        O[to] = O[from];
-                    } else {
-                        delete O[to];
-                    }
-                    k += 1;
-                }
-                k = len;
-                var minK = len - actualDeleteCount + itemCount;
-                while (k > minK) {
-                    delete O[k - 1];
-                    k -= 1;
-                }
-            } else if (itemCount > actualDeleteCount) {
-                k = len - actualDeleteCount;
-                while (k > actualStart) {
-                    from = $String(k + actualDeleteCount - 1);
-                    to = $String(k + itemCount - 1);
-                    if (owns(O, from)) {
-                        O[to] = O[from];
-                    } else {
-                        delete O[to];
-                    }
-                    k -= 1;
-                }
-            }
-            k = actualStart;
-            for (var i = 0; i < items.length; ++i) {
-                O[k] = items[i];
-                k += 1;
-            }
-            O.length = len - actualDeleteCount + itemCount;
-
-            return A;
-        }
-    }, !spliceWorksWithLargeSparseArrays || !spliceWorksWithSmallSparseArrays);
-
-    var originalJoin = ArrayPrototype.join;
-    var hasStringJoinBug;
-    try {
-        hasStringJoinBug = Array.prototype.join.call('123', ',') !== '1,2,3';
-    } catch (e) {
-        hasStringJoinBug = true;
-    }
-    if (hasStringJoinBug) {
-        defineProperties(ArrayPrototype, {
-            join: function join(separator) {
-                var sep = typeof separator === 'undefined' ? ',' : separator;
-                return originalJoin.call(isString(this) ? strSplit(this, '') : this, sep);
-            }
-        }, hasStringJoinBug);
-    }
-
-    var hasJoinUndefinedBug = [1, 2].join(undefined) !== '1,2';
-    if (hasJoinUndefinedBug) {
-        defineProperties(ArrayPrototype, {
-            join: function join(separator) {
-                var sep = typeof separator === 'undefined' ? ',' : separator;
-                return originalJoin.call(this, sep);
-            }
-        }, hasJoinUndefinedBug);
-    }
-
-    var pushShim = function push(item) {
-        var O = ES.ToObject(this);
-        var n = ES.ToUint32(O.length);
-        var i = 0;
-        while (i < arguments.length) {
-            O[n + i] = arguments[i];
-            i += 1;
-        }
-        O.length = n + i;
-        return n + i;
-    };
-
-    var pushIsNotGeneric = (function () {
-        var obj = {};
-        var result = Array.prototype.push.call(obj, undefined);
-        return result !== 1 || obj.length !== 1 || typeof obj[0] !== 'undefined' || !owns(obj, 0);
-    }());
-    defineProperties(ArrayPrototype, {
-        push: function push(item) {
-            if (isArray(this)) {
-                return array_push.apply(this, arguments);
-            }
-            return pushShim.apply(this, arguments);
-        }
-    }, pushIsNotGeneric);
-
-    // This fixes a very weird bug in Opera 10.6 when pushing `undefined
-    var pushUndefinedIsWeird = (function () {
-        var arr = [];
-        var result = arr.push(undefined);
-        return result !== 1 || arr.length !== 1 || typeof arr[0] !== 'undefined' || !owns(arr, 0);
-    }());
-    defineProperties(ArrayPrototype, { push: pushShim }, pushUndefinedIsWeird);
-
-    // ES5 15.2.3.14
-    // http://es5.github.io/#x15.4.4.10
-    // Fix boxed string bug
-    defineProperties(ArrayPrototype, {
-        slice: function (start, end) {
-            var arr = isString(this) ? strSplit(this, '') : this;
-            return arraySliceApply(arr, arguments);
-        }
-    }, splitString);
-
-    var sortIgnoresNonFunctions = (function () {
-        try {
-            [1, 2].sort(null);
-            [1, 2].sort({});
-            return true;
-        } catch (e) {}
-        return false;
-    }());
-    var sortThrowsOnRegex = (function () {
-        // this is a problem in Firefox 4, in which `typeof /a/ === 'function'`
-        try {
-            [1, 2].sort(/a/);
-            return false;
-        } catch (e) {}
-        return true;
-    }());
-    var sortIgnoresUndefined = (function () {
-        // applies in IE 8, for one.
-        try {
-            [1, 2].sort(undefined);
-            return true;
-        } catch (e) {}
-        return false;
-    }());
-    defineProperties(ArrayPrototype, {
-        sort: function sort(compareFn) {
-            if (typeof compareFn === 'undefined') {
-                return arraySort(this);
-            }
-            if (!isCallable(compareFn)) {
-                throw new TypeError('Array.prototype.sort callback must be a function');
-            }
-            return arraySort(this, compareFn);
-        }
-    }, sortIgnoresNonFunctions || !sortIgnoresUndefined || !sortThrowsOnRegex);
-
-    //
-    // Object
-    // ======
-    //
-
-    // ES5 15.2.3.14
-    // http://es5.github.com/#x15.2.3.14
-
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = !isEnum({ 'toString': null }, 'toString');
-    var hasProtoEnumBug = isEnum(function () {}, 'prototype');
-    var hasStringEnumBug = !owns('x', '0');
-    var equalsConstructorPrototype = function (o) {
-        var ctor = o.constructor;
-        return ctor && ctor.prototype === o;
-    };
-    var blacklistedKeys = {
-        $window: true,
-        $console: true,
-        $parent: true,
-        $self: true,
-        $frame: true,
-        $frames: true,
-        $frameElement: true,
-        $webkitIndexedDB: true,
-        $webkitStorageInfo: true,
-        $external: true
-    };
-    var hasAutomationEqualityBug = (function () {
-        /* globals window */
-        if (typeof window === 'undefined') {
-            return false;
-        }
-        for (var k in window) {
-            try {
-                if (!blacklistedKeys['$' + k] && owns(window, k) && window[k] !== null && typeof window[k] === 'object') {
-                    equalsConstructorPrototype(window[k]);
-                }
-            } catch (e) {
-                return true;
-            }
-        }
-        return false;
-    }());
-    var equalsConstructorPrototypeIfNotBuggy = function (object) {
-        if (typeof window === 'undefined' || !hasAutomationEqualityBug) {
-            return equalsConstructorPrototype(object);
-        }
-        try {
-            return equalsConstructorPrototype(object);
-        } catch (e) {
-            return false;
-        }
-    };
-    var dontEnums = [
-        'toString',
-        'toLocaleString',
-        'valueOf',
-        'hasOwnProperty',
-        'isPrototypeOf',
-        'propertyIsEnumerable',
-        'constructor'
-    ];
-    var dontEnumsLength = dontEnums.length;
-
-    // taken directly from https://github.com/ljharb/is-arguments/blob/master/index.js
-    // can be replaced with require('is-arguments') if we ever use a build process instead
-    var isStandardArguments = function isArguments(value) {
-        return toStr(value) === '[object Arguments]';
-    };
-    var isLegacyArguments = function isArguments(value) {
-        return value !== null &&
-            typeof value === 'object' &&
-            typeof value.length === 'number' &&
-            value.length >= 0 &&
-            !isArray(value) &&
-            isCallable(value.callee);
-    };
-    var isArguments = isStandardArguments(arguments) ? isStandardArguments : isLegacyArguments;
-
-    defineProperties($Object, {
-        keys: function keys(object) {
-            var isFn = isCallable(object);
-            var isArgs = isArguments(object);
-            var isObject = object !== null && typeof object === 'object';
-            var isStr = isObject && isString(object);
-
-            if (!isObject && !isFn && !isArgs) {
-                throw new TypeError('Object.keys called on a non-object');
-            }
-
-            var theKeys = [];
-            var skipProto = hasProtoEnumBug && isFn;
-            if ((isStr && hasStringEnumBug) || isArgs) {
-                for (var i = 0; i < object.length; ++i) {
-                    pushCall(theKeys, $String(i));
-                }
-            }
-
-            if (!isArgs) {
-                for (var name in object) {
-                    if (!(skipProto && name === 'prototype') && owns(object, name)) {
-                        pushCall(theKeys, $String(name));
-                    }
-                }
-            }
-
-            if (hasDontEnumBug) {
-                var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);
-                for (var j = 0; j < dontEnumsLength; j++) {
-                    var dontEnum = dontEnums[j];
-                    if (!(skipConstructor && dontEnum === 'constructor') && owns(object, dontEnum)) {
-                        pushCall(theKeys, dontEnum);
-                    }
-                }
-            }
-            return theKeys;
-        }
-    });
-
-    var keysWorksWithArguments = $Object.keys && (function () {
-        // Safari 5.0 bug
-        return $Object.keys(arguments).length === 2;
-    }(1, 2));
-    var keysHasArgumentsLengthBug = $Object.keys && (function () {
-        var argKeys = $Object.keys(arguments);
-        return arguments.length !== 1 || argKeys.length !== 1 || argKeys[0] !== 1;
-    }(1));
-    var originalKeys = $Object.keys;
-    defineProperties($Object, {
-        keys: function keys(object) {
-            if (isArguments(object)) {
-                return originalKeys(arraySlice(object));
-            } else {
-                return originalKeys(object);
-            }
-        }
-    }, !keysWorksWithArguments || keysHasArgumentsLengthBug);
-
-    //
-    // Date
-    // ====
-    //
-
-    var hasNegativeMonthYearBug = new Date(-3509827329600292).getUTCMonth() !== 0;
-    var aNegativeTestDate = new Date(-1509842289600292);
-    var aPositiveTestDate = new Date(1449662400000);
-    var hasToUTCStringFormatBug = aNegativeTestDate.toUTCString() !== 'Mon, 01 Jan -45875 11:59:59 GMT';
-    var hasToDateStringFormatBug;
-    var hasToStringFormatBug;
-    var timeZoneOffset = aNegativeTestDate.getTimezoneOffset();
-    if (timeZoneOffset < -720) {
-        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Tue Jan 02 -45875';
-        hasToStringFormatBug = !(/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
-    } else {
-        hasToDateStringFormatBug = aNegativeTestDate.toDateString() !== 'Mon Jan 01 -45875';
-        hasToStringFormatBug = !(/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/).test(aPositiveTestDate.toString());
-    }
-
-    var originalGetFullYear = call.bind(Date.prototype.getFullYear);
-    var originalGetMonth = call.bind(Date.prototype.getMonth);
-    var originalGetDate = call.bind(Date.prototype.getDate);
-    var originalGetUTCFullYear = call.bind(Date.prototype.getUTCFullYear);
-    var originalGetUTCMonth = call.bind(Date.prototype.getUTCMonth);
-    var originalGetUTCDate = call.bind(Date.prototype.getUTCDate);
-    var originalGetUTCDay = call.bind(Date.prototype.getUTCDay);
-    var originalGetUTCHours = call.bind(Date.prototype.getUTCHours);
-    var originalGetUTCMinutes = call.bind(Date.prototype.getUTCMinutes);
-    var originalGetUTCSeconds = call.bind(Date.prototype.getUTCSeconds);
-    var originalGetUTCMilliseconds = call.bind(Date.prototype.getUTCMilliseconds);
-    var dayName = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    var monthName = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-    var daysInMonth = function daysInMonth(month, year) {
-        return originalGetDate(new Date(year, month, 0));
-    };
-
-    defineProperties(Date.prototype, {
-        getFullYear: function getFullYear() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            if (year < 0 && originalGetMonth(this) > 11) {
-                return year + 1;
-            }
-            return year;
-        },
-        getMonth: function getMonth() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            var month = originalGetMonth(this);
-            if (year < 0 && month > 11) {
-                return 0;
-            }
-            return month;
-        },
-        getDate: function getDate() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetFullYear(this);
-            var month = originalGetMonth(this);
-            var date = originalGetDate(this);
-            if (year < 0 && month > 11) {
-                if (month === 12) {
-                    return date;
-                }
-                var days = daysInMonth(0, year + 1);
-                return (days - date) + 1;
-            }
-            return date;
-        },
-        getUTCFullYear: function getUTCFullYear() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            if (year < 0 && originalGetUTCMonth(this) > 11) {
-                return year + 1;
-            }
-            return year;
-        },
-        getUTCMonth: function getUTCMonth() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            var month = originalGetUTCMonth(this);
-            if (year < 0 && month > 11) {
-                return 0;
-            }
-            return month;
-        },
-        getUTCDate: function getUTCDate() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var year = originalGetUTCFullYear(this);
-            var month = originalGetUTCMonth(this);
-            var date = originalGetUTCDate(this);
-            if (year < 0 && month > 11) {
-                if (month === 12) {
-                    return date;
-                }
-                var days = daysInMonth(0, year + 1);
-                return (days - date) + 1;
-            }
-            return date;
-        }
-    }, hasNegativeMonthYearBug);
-
-    defineProperties(Date.prototype, {
-        toUTCString: function toUTCString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = originalGetUTCDay(this);
-            var date = originalGetUTCDate(this);
-            var month = originalGetUTCMonth(this);
-            var year = originalGetUTCFullYear(this);
-            var hour = originalGetUTCHours(this);
-            var minute = originalGetUTCMinutes(this);
-            var second = originalGetUTCSeconds(this);
-            return dayName[day] + ', ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                monthName[month] + ' ' +
-                year + ' ' +
-                (hour < 10 ? '0' + hour : hour) + ':' +
-                (minute < 10 ? '0' + minute : minute) + ':' +
-                (second < 10 ? '0' + second : second) + ' GMT';
-        }
-    }, hasNegativeMonthYearBug || hasToUTCStringFormatBug);
-
-    // Opera 12 has `,`
-    defineProperties(Date.prototype, {
-        toDateString: function toDateString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = this.getDay();
-            var date = this.getDate();
-            var month = this.getMonth();
-            var year = this.getFullYear();
-            return dayName[day] + ' ' +
-                monthName[month] + ' ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                year;
-        }
-    }, hasNegativeMonthYearBug || hasToDateStringFormatBug);
-
-    // can't use defineProperties here because of toString enumeration issue in IE <= 8
-    if (hasNegativeMonthYearBug || hasToStringFormatBug) {
-        Date.prototype.toString = function toString() {
-            if (!this || !(this instanceof Date)) {
-                throw new TypeError('this is not a Date object.');
-            }
-            var day = this.getDay();
-            var date = this.getDate();
-            var month = this.getMonth();
-            var year = this.getFullYear();
-            var hour = this.getHours();
-            var minute = this.getMinutes();
-            var second = this.getSeconds();
-            var timezoneOffset = this.getTimezoneOffset();
-            var hoursOffset = Math.floor(Math.abs(timezoneOffset) / 60);
-            var minutesOffset = Math.floor(Math.abs(timezoneOffset) % 60);
-            return dayName[day] + ' ' +
-                monthName[month] + ' ' +
-                (date < 10 ? '0' + date : date) + ' ' +
-                year + ' ' +
-                (hour < 10 ? '0' + hour : hour) + ':' +
-                (minute < 10 ? '0' + minute : minute) + ':' +
-                (second < 10 ? '0' + second : second) + ' GMT' +
-                (timezoneOffset > 0 ? '-' : '+') +
-                (hoursOffset < 10 ? '0' + hoursOffset : hoursOffset) +
-                (minutesOffset < 10 ? '0' + minutesOffset : minutesOffset);
-        };
-        if (supportsDescriptors) {
-            $Object.defineProperty(Date.prototype, 'toString', {
-                configurable: true,
-                enumerable: false,
-                writable: true
-            });
-        }
-    }
-
-    // ES5 15.9.5.43
-    // http://es5.github.com/#x15.9.5.43
-    // This function returns a String value represent the instance in time
-    // represented by this Date object. The format of the String is the Date Time
-    // string format defined in 15.9.1.15. All fields are present in the String.
-    // The time zone is always UTC, denoted by the suffix Z. If the time value of
-    // this object is not a finite Number a RangeError exception is thrown.
-    var negativeDate = -62198755200000;
-    var negativeYearString = '-000001';
-    var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;
-    var hasSafari51DateBug = Date.prototype.toISOString && new Date(-1).toISOString() !== '1969-12-31T23:59:59.999Z';
-
-    var getTime = call.bind(Date.prototype.getTime);
-
-    defineProperties(Date.prototype, {
-        toISOString: function toISOString() {
-            if (!isFinite(this) || !isFinite(getTime(this))) {
-                // Adope Photoshop requires the second check.
-                throw new RangeError('Date.prototype.toISOString called on non-finite value.');
-            }
-
-            var year = originalGetUTCFullYear(this);
-
-            var month = originalGetUTCMonth(this);
-            // see https://github.com/es-shims/es5-shim/issues/111
-            year += Math.floor(month / 12);
-            month = (month % 12 + 12) % 12;
-
-            // the date time string format is specified in 15.9.1.15.
-            var result = [month + 1, originalGetUTCDate(this), originalGetUTCHours(this), originalGetUTCMinutes(this), originalGetUTCSeconds(this)];
-            year = (
-                (year < 0 ? '-' : (year > 9999 ? '+' : '')) +
-                strSlice('00000' + Math.abs(year), (0 <= year && year <= 9999) ? -4 : -6)
-            );
-
-            for (var i = 0; i < result.length; ++i) {
-                // pad months, days, hours, minutes, and seconds to have two digits.
-                result[i] = strSlice('00' + result[i], -2);
-            }
-            // pad milliseconds to have three digits.
-            return (
-                year + '-' + arraySlice(result, 0, 2).join('-') +
-                'T' + arraySlice(result, 2).join(':') + '.' +
-                strSlice('000' + originalGetUTCMilliseconds(this), -3) + 'Z'
-            );
-        }
-    }, hasNegativeDateBug || hasSafari51DateBug);
-
-    // ES5 15.9.5.44
-    // http://es5.github.com/#x15.9.5.44
-    // This function provides a String representation of a Date object for use by
-    // JSON.stringify (15.12.3).
-    var dateToJSONIsSupported = (function () {
-        try {
-            return Date.prototype.toJSON &&
-                new Date(NaN).toJSON() === null &&
-                new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
-                Date.prototype.toJSON.call({ // generic
-                    toISOString: function () { return true; }
-                });
-        } catch (e) {
-            return false;
-        }
-    }());
-    if (!dateToJSONIsSupported) {
-        Date.prototype.toJSON = function toJSON(key) {
-            // When the toJSON method is called with argument key, the following
-            // steps are taken:
-
-            // 1.  Let O be the result of calling ToObject, giving it the this
-            // value as its argument.
-            // 2. Let tv be ES.ToPrimitive(O, hint Number).
-            var O = $Object(this);
-            var tv = ES.ToPrimitive(O);
-            // 3. If tv is a Number and is not finite, return null.
-            if (typeof tv === 'number' && !isFinite(tv)) {
-                return null;
-            }
-            // 4. Let toISO be the result of calling the [[Get]] internal method of
-            // O with argument "toISOString".
-            var toISO = O.toISOString;
-            // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-            if (!isCallable(toISO)) {
-                throw new TypeError('toISOString property is not callable');
-            }
-            // 6. Return the result of calling the [[Call]] internal method of
-            //  toISO with O as the this value and an empty argument list.
-            return toISO.call(O);
-
-            // NOTE 1 The argument is ignored.
-
-            // NOTE 2 The toJSON function is intentionally generic; it does not
-            // require that its this value be a Date object. Therefore, it can be
-            // transferred to other kinds of objects for use as a method. However,
-            // it does require that any such object have a toISOString method. An
-            // object is free to use the argument key to filter its
-            // stringification.
-        };
-    }
-
-    // ES5 15.9.4.2
-    // http://es5.github.com/#x15.9.4.2
-    // based on work shared by Daniel Friesen (dantman)
-    // http://gist.github.com/303249
-    var supportsExtendedYears = Date.parse('+033658-09-27T01:46:40.000Z') === 1e15;
-    var acceptsInvalidDates = !isNaN(Date.parse('2012-04-04T24:00:00.500Z')) || !isNaN(Date.parse('2012-11-31T23:59:59.000Z')) || !isNaN(Date.parse('2012-12-31T23:59:60.000Z'));
-    var doesNotParseY2KNewYear = isNaN(Date.parse('2000-01-01T00:00:00.000Z'));
-    if (doesNotParseY2KNewYear || acceptsInvalidDates || !supportsExtendedYears) {
-        // XXX global assignment won't work in embeddings that use
-        // an alternate object for the context.
-        /* global Date: true */
-        /* eslint-disable no-undef */
-        var maxSafeUnsigned32Bit = Math.pow(2, 31) - 1;
-        var hasSafariSignedIntBug = isActualNaN(new Date(1970, 0, 1, 0, 0, 0, maxSafeUnsigned32Bit + 1).getTime());
-        /* eslint-disable no-implicit-globals */
-        Date = (function (NativeDate) {
-        /* eslint-enable no-implicit-globals */
-        /* eslint-enable no-undef */
-            // Date.length === 7
-            var DateShim = function Date(Y, M, D, h, m, s, ms) {
-                var length = arguments.length;
-                var date;
-                if (this instanceof NativeDate) {
-                    var seconds = s;
-                    var millis = ms;
-                    if (hasSafariSignedIntBug && length >= 7 && ms > maxSafeUnsigned32Bit) {
-                        // work around a Safari 8/9 bug where it treats the seconds as signed
-                        var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
-                        var sToShift = Math.floor(msToShift / 1e3);
-                        seconds += sToShift;
-                        millis -= sToShift * 1e3;
-                    }
-                    date = length === 1 && $String(Y) === Y ? // isString(Y)
-                        // We explicitly pass it through parse:
-                        new NativeDate(DateShim.parse(Y)) :
-                        // We have to manually make calls depending on argument
-                        // length here
-                        length >= 7 ? new NativeDate(Y, M, D, h, m, seconds, millis) :
-                        length >= 6 ? new NativeDate(Y, M, D, h, m, seconds) :
-                        length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                        length >= 4 ? new NativeDate(Y, M, D, h) :
-                        length >= 3 ? new NativeDate(Y, M, D) :
-                        length >= 2 ? new NativeDate(Y, M) :
-                        length >= 1 ? new NativeDate(Y instanceof NativeDate ? +Y : Y) :
-                                      new NativeDate();
-                } else {
-                    date = NativeDate.apply(this, arguments);
-                }
-                if (!isPrimitive(date)) {
-                    // Prevent mixups with unfixed Date object
-                    defineProperties(date, { constructor: DateShim }, true);
-                }
-                return date;
-            };
-
-            // 15.9.1.15 Date Time String Format.
-            var isoDateExpression = new RegExp('^' +
-                '(\\d{4}|[+-]\\d{6})' + // four-digit year capture or sign +
-                                          // 6-digit extended year
-                '(?:-(\\d{2})' + // optional month capture
-                '(?:-(\\d{2})' + // optional day capture
-                '(?:' + // capture hours:minutes:seconds.milliseconds
-                    'T(\\d{2})' + // hours capture
-                    ':(\\d{2})' + // minutes capture
-                    '(?:' + // optional :seconds.milliseconds
-                        ':(\\d{2})' + // seconds capture
-                        '(?:(\\.\\d{1,}))?' + // milliseconds capture
-                    ')?' +
-                '(' + // capture UTC offset component
-                    'Z|' + // UTC capture
-                    '(?:' + // offset specifier +/-hours:minutes
-                        '([-+])' + // sign capture
-                        '(\\d{2})' + // hours offset capture
-                        ':(\\d{2})' + // minutes offset capture
-                    ')' +
-                ')?)?)?)?' +
-            '$');
-
-            var months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
-
-            var dayFromMonth = function dayFromMonth(year, month) {
-                var t = month > 1 ? 1 : 0;
-                return (
-                    months[month] +
-                    Math.floor((year - 1969 + t) / 4) -
-                    Math.floor((year - 1901 + t) / 100) +
-                    Math.floor((year - 1601 + t) / 400) +
-                    365 * (year - 1970)
-                );
-            };
-
-            var toUTC = function toUTC(t) {
-                var s = 0;
-                var ms = t;
-                if (hasSafariSignedIntBug && ms > maxSafeUnsigned32Bit) {
-                    // work around a Safari 8/9 bug where it treats the seconds as signed
-                    var msToShift = Math.floor(ms / maxSafeUnsigned32Bit) * maxSafeUnsigned32Bit;
-                    var sToShift = Math.floor(msToShift / 1e3);
-                    s += sToShift;
-                    ms -= sToShift * 1e3;
-                }
-                return $Number(new NativeDate(1970, 0, 1, 0, 0, s, ms));
-            };
-
-            // Copy any custom methods a 3rd party library may have added
-            for (var key in NativeDate) {
-                if (owns(NativeDate, key)) {
-                    DateShim[key] = NativeDate[key];
-                }
-            }
-
-            // Copy "native" methods explicitly; they may be non-enumerable
-            defineProperties(DateShim, {
-                now: NativeDate.now,
-                UTC: NativeDate.UTC
-            }, true);
-            DateShim.prototype = NativeDate.prototype;
-            defineProperties(DateShim.prototype, {
-                constructor: DateShim
-            }, true);
-
-            // Upgrade Date.parse to handle simplified ISO 8601 strings
-            var parseShim = function parse(string) {
-                var match = isoDateExpression.exec(string);
-                if (match) {
-                    // parse months, days, hours, minutes, seconds, and milliseconds
-                    // provide default values if necessary
-                    // parse the UTC offset component
-                    var year = $Number(match[1]),
-                        month = $Number(match[2] || 1) - 1,
-                        day = $Number(match[3] || 1) - 1,
-                        hour = $Number(match[4] || 0),
-                        minute = $Number(match[5] || 0),
-                        second = $Number(match[6] || 0),
-                        millisecond = Math.floor($Number(match[7] || 0) * 1000),
-                        // When time zone is missed, local offset should be used
-                        // (ES 5.1 bug)
-                        // see https://bugs.ecmascript.org/show_bug.cgi?id=112
-                        isLocalTime = Boolean(match[4] && !match[8]),
-                        signOffset = match[9] === '-' ? 1 : -1,
-                        hourOffset = $Number(match[10] || 0),
-                        minuteOffset = $Number(match[11] || 0),
-                        result;
-                    var hasMinutesOrSecondsOrMilliseconds = minute > 0 || second > 0 || millisecond > 0;
-                    if (
-                        hour < (hasMinutesOrSecondsOrMilliseconds ? 24 : 25) &&
-                        minute < 60 && second < 60 && millisecond < 1000 &&
-                        month > -1 && month < 12 && hourOffset < 24 &&
-                        minuteOffset < 60 && // detect invalid offsets
-                        day > -1 &&
-                        day < (dayFromMonth(year, month + 1) - dayFromMonth(year, month))
-                    ) {
-                        result = (
-                            (dayFromMonth(year, month) + day) * 24 +
-                            hour +
-                            hourOffset * signOffset
-                        ) * 60;
-                        result = (
-                            (result + minute + minuteOffset * signOffset) * 60 +
-                            second
-                        ) * 1000 + millisecond;
-                        if (isLocalTime) {
-                            result = toUTC(result);
-                        }
-                        if (-8.64e15 <= result && result <= 8.64e15) {
-                            return result;
-                        }
-                    }
-                    return NaN;
-                }
-                return NativeDate.parse.apply(this, arguments);
-            };
-            defineProperties(DateShim, { parse: parseShim });
-
-            return DateShim;
-        }(Date));
-        /* global Date: false */
-    }
-
-    // ES5 15.9.4.4
-    // http://es5.github.com/#x15.9.4.4
-    if (!Date.now) {
-        Date.now = function now() {
-            return new Date().getTime();
-        };
-    }
-
-    //
-    // Number
-    // ======
-    //
-
-    // ES5.1 15.7.4.5
-    // http://es5.github.com/#x15.7.4.5
-    var hasToFixedBugs = NumberPrototype.toFixed && (
-      (0.00008).toFixed(3) !== '0.000' ||
-      (0.9).toFixed(0) !== '1' ||
-      (1.255).toFixed(2) !== '1.25' ||
-      (1000000000000000128).toFixed(0) !== '1000000000000000128'
-    );
-
-    var toFixedHelpers = {
-        base: 1e7,
-        size: 6,
-        data: [0, 0, 0, 0, 0, 0],
-        multiply: function multiply(n, c) {
-            var i = -1;
-            var c2 = c;
-            while (++i < toFixedHelpers.size) {
-                c2 += n * toFixedHelpers.data[i];
-                toFixedHelpers.data[i] = c2 % toFixedHelpers.base;
-                c2 = Math.floor(c2 / toFixedHelpers.base);
-            }
-        },
-        divide: function divide(n) {
-            var i = toFixedHelpers.size;
-            var c = 0;
-            while (--i >= 0) {
-                c += toFixedHelpers.data[i];
-                toFixedHelpers.data[i] = Math.floor(c / n);
-                c = (c % n) * toFixedHelpers.base;
-            }
-        },
-        numToString: function numToString() {
-            var i = toFixedHelpers.size;
-            var s = '';
-            while (--i >= 0) {
-                if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {
-                    var t = $String(toFixedHelpers.data[i]);
-                    if (s === '') {
-                        s = t;
-                    } else {
-                        s += strSlice('0000000', 0, 7 - t.length) + t;
-                    }
-                }
-            }
-            return s;
-        },
-        pow: function pow(x, n, acc) {
-            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
-        },
-        log: function log(x) {
-            var n = 0;
-            var x2 = x;
-            while (x2 >= 4096) {
-                n += 12;
-                x2 /= 4096;
-            }
-            while (x2 >= 2) {
-                n += 1;
-                x2 /= 2;
-            }
-            return n;
-        }
-    };
-
-    var toFixedShim = function toFixed(fractionDigits) {
-        var f, x, s, m, e, z, j, k;
-
-        // Test for NaN and round fractionDigits down
-        f = $Number(fractionDigits);
-        f = isActualNaN(f) ? 0 : Math.floor(f);
-
-        if (f < 0 || f > 20) {
-            throw new RangeError('Number.toFixed called with invalid number of decimals');
-        }
-
-        x = $Number(this);
-
-        if (isActualNaN(x)) {
-            return 'NaN';
-        }
-
-        // If it is too big or small, return the string value of the number
-        if (x <= -1e21 || x >= 1e21) {
-            return $String(x);
-        }
-
-        s = '';
-
-        if (x < 0) {
-            s = '-';
-            x = -x;
-        }
-
-        m = '0';
-
-        if (x > 1e-21) {
-            // 1e-21 < x < 1e21
-            // -70 < log2(x) < 70
-            e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;
-            z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));
-            z *= 0x10000000000000; // Math.pow(2, 52);
-            e = 52 - e;
-
-            // -18 < e < 122
-            // x = z / 2 ^ e
-            if (e > 0) {
-                toFixedHelpers.multiply(0, z);
-                j = f;
-
-                while (j >= 7) {
-                    toFixedHelpers.multiply(1e7, 0);
-                    j -= 7;
-                }
-
-                toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);
-                j = e - 1;
-
-                while (j >= 23) {
-                    toFixedHelpers.divide(1 << 23);
-                    j -= 23;
-                }
-
-                toFixedHelpers.divide(1 << j);
-                toFixedHelpers.multiply(1, 1);
-                toFixedHelpers.divide(2);
-                m = toFixedHelpers.numToString();
-            } else {
-                toFixedHelpers.multiply(0, z);
-                toFixedHelpers.multiply(1 << (-e), 0);
-                m = toFixedHelpers.numToString() + strSlice('0.00000000000000000000', 2, 2 + f);
-            }
-        }
-
-        if (f > 0) {
-            k = m.length;
-
-            if (k <= f) {
-                m = s + strSlice('0.0000000000000000000', 0, f - k + 2) + m;
-            } else {
-                m = s + strSlice(m, 0, k - f) + '.' + strSlice(m, k - f);
-            }
-        } else {
-            m = s + m;
-        }
-
-        return m;
-    };
-    defineProperties(NumberPrototype, { toFixed: toFixedShim }, hasToFixedBugs);
-
-    var hasToPrecisionUndefinedBug = (function () {
-        try {
-            return 1.0.toPrecision(undefined) === '1';
-        } catch (e) {
-            return true;
-        }
-    }());
-    var originalToPrecision = NumberPrototype.toPrecision;
-    defineProperties(NumberPrototype, {
-        toPrecision: function toPrecision(precision) {
-            return typeof precision === 'undefined' ? originalToPrecision.call(this) : originalToPrecision.call(this, precision);
-        }
-    }, hasToPrecisionUndefinedBug);
-
-    //
-    // String
-    // ======
-    //
-
-    // ES5 15.5.4.14
-    // http://es5.github.com/#x15.5.4.14
-
-    // [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]
-    // Many browsers do not split properly with regular expressions or they
-    // do not perform the split correctly under obscure conditions.
-    // See http://blog.stevenlevithan.com/archives/cross-browser-split
-    // I've tested in many browsers and this seems to cover the deviant ones:
-    //    'ab'.split(/(?:ab)*/) should be ["", ""], not [""]
-    //    '.'.split(/(.?)(.?)/) should be ["", ".", "", ""], not ["", ""]
-    //    'tesst'.split(/(s)*/) should be ["t", undefined, "e", "s", "t"], not
-    //       [undefined, "t", undefined, "e", ...]
-    //    ''.split(/.?/) should be [], not [""]
-    //    '.'.split(/()()/) should be ["."], not ["", "", "."]
-
-    if (
-        'ab'.split(/(?:ab)*/).length !== 2 ||
-        '.'.split(/(.?)(.?)/).length !== 4 ||
-        'tesst'.split(/(s)*/)[1] === 't' ||
-        'test'.split(/(?:)/, -1).length !== 4 ||
-        ''.split(/.?/).length ||
-        '.'.split(/()()/).length > 1
-    ) {
-        (function () {
-            var compliantExecNpcg = typeof (/()??/).exec('')[1] === 'undefined'; // NPCG: nonparticipating capturing group
-            var maxSafe32BitInt = Math.pow(2, 32) - 1;
-
-            StringPrototype.split = function (separator, limit) {
-                var string = String(this);
-                if (typeof separator === 'undefined' && limit === 0) {
-                    return [];
-                }
-
-                // If `separator` is not a regex, use native split
-                if (!isRegex(separator)) {
-                    return strSplit(this, separator, limit);
-                }
-
-                var output = [];
-                var flags = (separator.ignoreCase ? 'i' : '') +
-                            (separator.multiline ? 'm' : '') +
-                            (separator.unicode ? 'u' : '') + // in ES6
-                            (separator.sticky ? 'y' : ''), // Firefox 3+ and ES6
-                    lastLastIndex = 0,
-                    // Make `global` and avoid `lastIndex` issues by working with a copy
-                    separator2, match, lastIndex, lastLength;
-                var separatorCopy = new RegExp(separator.source, flags + 'g');
-                if (!compliantExecNpcg) {
-                    // Doesn't need flags gy, but they don't hurt
-                    separator2 = new RegExp('^' + separatorCopy.source + '$(?!\\s)', flags);
-                }
-                /* Values for `limit`, per the spec:
-                 * If undefined: 4294967295 // maxSafe32BitInt
-                 * If 0, Infinity, or NaN: 0
-                 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-                 * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-                 * If other: Type-convert, then use the above rules
-                 */
-                var splitLimit = typeof limit === 'undefined' ? maxSafe32BitInt : ES.ToUint32(limit);
-                match = separatorCopy.exec(string);
-                while (match) {
-                    // `separatorCopy.lastIndex` is not reliable cross-browser
-                    lastIndex = match.index + match[0].length;
-                    if (lastIndex > lastLastIndex) {
-                        pushCall(output, strSlice(string, lastLastIndex, match.index));
-                        // Fix browsers whose `exec` methods don't consistently return `undefined` for
-                        // nonparticipating capturing groups
-                        if (!compliantExecNpcg && match.length > 1) {
-                            /* eslint-disable no-loop-func */
-                            match[0].replace(separator2, function () {
-                                for (var i = 1; i < arguments.length - 2; i++) {
-                                    if (typeof arguments[i] === 'undefined') {
-                                        match[i] = void 0;
-                                    }
-                                }
-                            });
-                            /* eslint-enable no-loop-func */
-                        }
-                        if (match.length > 1 && match.index < string.length) {
-                            array_push.apply(output, arraySlice(match, 1));
-                        }
-                        lastLength = match[0].length;
-                        lastLastIndex = lastIndex;
-                        if (output.length >= splitLimit) {
-                            break;
-                        }
-                    }
-                    if (separatorCopy.lastIndex === match.index) {
-                        separatorCopy.lastIndex++; // Avoid an infinite loop
-                    }
-                    match = separatorCopy.exec(string);
-                }
-                if (lastLastIndex === string.length) {
-                    if (lastLength || !separatorCopy.test('')) {
-                        pushCall(output, '');
-                    }
-                } else {
-                    pushCall(output, strSlice(string, lastLastIndex));
-                }
-                return output.length > splitLimit ? arraySlice(output, 0, splitLimit) : output;
-            };
-        }());
-
-    // [bugfix, chrome]
-    // If separator is undefined, then the result array contains just one String,
-    // which is the this value (converted to a String). If limit is not undefined,
-    // then the output array is truncated so that it contains no more than limit
-    // elements.
-    // "0".split(undefined, 0) -> []
-    } else if ('0'.split(void 0, 0).length) {
-        StringPrototype.split = function split(separator, limit) {
-            if (typeof separator === 'undefined' && limit === 0) {
-                return [];
-            }
-            return strSplit(this, separator, limit);
-        };
-    }
-
-    var str_replace = StringPrototype.replace;
-    var replaceReportsGroupsCorrectly = (function () {
-        var groups = [];
-        'x'.replace(/x(.)?/g, function (match, group) {
-            pushCall(groups, group);
-        });
-        return groups.length === 1 && typeof groups[0] === 'undefined';
-    }());
-
-    if (!replaceReportsGroupsCorrectly) {
-        StringPrototype.replace = function replace(searchValue, replaceValue) {
-            var isFn = isCallable(replaceValue);
-            var hasCapturingGroups = isRegex(searchValue) && (/\)[*?]/).test(searchValue.source);
-            if (!isFn || !hasCapturingGroups) {
-                return str_replace.call(this, searchValue, replaceValue);
-            } else {
-                var wrappedReplaceValue = function (match) {
-                    var length = arguments.length;
-                    var originalLastIndex = searchValue.lastIndex;
-                    searchValue.lastIndex = 0;
-                    var args = searchValue.exec(match) || [];
-                    searchValue.lastIndex = originalLastIndex;
-                    pushCall(args, arguments[length - 2], arguments[length - 1]);
-                    return replaceValue.apply(this, args);
-                };
-                return str_replace.call(this, searchValue, wrappedReplaceValue);
-            }
-        };
-    }
-
-    // ECMA-262, 3rd B.2.3
-    // Not an ECMAScript standard, although ECMAScript 3rd Edition has a
-    // non-normative section suggesting uniform semantics and it should be
-    // normalized across all browsers
-    // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
-    var string_substr = StringPrototype.substr;
-    var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';
-    defineProperties(StringPrototype, {
-        substr: function substr(start, length) {
-            var normalizedStart = start;
-            if (start < 0) {
-                normalizedStart = max(this.length + start, 0);
-            }
-            return string_substr.call(this, normalizedStart, length);
-        }
-    }, hasNegativeSubstrBug);
-
-    // ES5 15.5.4.20
-    // whitespace from: http://es5.github.io/#x15.5.4.20
-    var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
-        '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
-        '\u2029\uFEFF';
-    var zeroWidth = '\u200b';
-    var wsRegexChars = '[' + ws + ']';
-    var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');
-    var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');
-    var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
-    defineProperties(StringPrototype, {
-        // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-        // http://perfectionkills.com/whitespace-deviations/
-        trim: function trim() {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            return $String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
-        }
-    }, hasTrimWhitespaceBug);
-    var trim = call.bind(String.prototype.trim);
-
-    var hasLastIndexBug = StringPrototype.lastIndexOf && 'abcあい'.lastIndexOf('あい', 2) !== -1;
-    defineProperties(StringPrototype, {
-        lastIndexOf: function lastIndexOf(searchString) {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            var S = $String(this);
-            var searchStr = $String(searchString);
-            var numPos = arguments.length > 1 ? $Number(arguments[1]) : NaN;
-            var pos = isActualNaN(numPos) ? Infinity : ES.ToInteger(numPos);
-            var start = min(max(pos, 0), S.length);
-            var searchLen = searchStr.length;
-            var k = start + searchLen;
-            while (k > 0) {
-                k = max(0, k - searchLen);
-                var index = strIndexOf(strSlice(S, k, start + searchLen), searchStr);
-                if (index !== -1) {
-                    return k + index;
-                }
-            }
-            return -1;
-        }
-    }, hasLastIndexBug);
-
-    var originalLastIndexOf = StringPrototype.lastIndexOf;
-    defineProperties(StringPrototype, {
-        lastIndexOf: function lastIndexOf(searchString) {
-            return originalLastIndexOf.apply(this, arguments);
-        }
-    }, StringPrototype.lastIndexOf.length !== 1);
-
-    // ES-5 15.1.2.2
-    /* eslint-disable radix */
-    if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {
-    /* eslint-enable radix */
-        /* global parseInt: true */
-        parseInt = (function (origParseInt) {
-            var hexRegex = /^[\-+]?0[xX]/;
-            return function parseInt(str, radix) {
-                var string = trim(String(str));
-                var defaultedRadix = $Number(radix) || (hexRegex.test(string) ? 16 : 10);
-                return origParseInt(string, defaultedRadix);
-            };
-        }(parseInt));
-    }
-
-    // https://es5.github.io/#x15.1.2.3
-    if (1 / parseFloat('-0') !== -Infinity) {
-        /* global parseFloat: true */
-        parseFloat = (function (origParseFloat) {
-            return function parseFloat(string) {
-                var inputString = trim(String(string));
-                var result = origParseFloat(inputString);
-                return result === 0 && strSlice(inputString, 0, 1) === '-' ? -0 : result;
-            };
-        }(parseFloat));
-    }
-
-    if (String(new RangeError('test')) !== 'RangeError: test') {
-        var errorToStringShim = function toString() {
-            if (typeof this === 'undefined' || this === null) {
-                throw new TypeError("can't convert " + this + ' to object');
-            }
-            var name = this.name;
-            if (typeof name === 'undefined') {
-                name = 'Error';
-            } else if (typeof name !== 'string') {
-                name = $String(name);
-            }
-            var msg = this.message;
-            if (typeof msg === 'undefined') {
-                msg = '';
-            } else if (typeof msg !== 'string') {
-                msg = $String(msg);
-            }
-            if (!name) {
-                return msg;
-            }
-            if (!msg) {
-                return name;
-            }
-            return name + ': ' + msg;
-        };
-        // can't use defineProperties here because of toString enumeration issue in IE <= 8
-        Error.prototype.toString = errorToStringShim;
-    }
-
-    if (supportsDescriptors) {
-        var ensureNonEnumerable = function (obj, prop) {
-            if (isEnum(obj, prop)) {
-                var desc = Object.getOwnPropertyDescriptor(obj, prop);
-                if (desc.configurable) {
-                    desc.enumerable = false;
-                    Object.defineProperty(obj, prop, desc);
-                }
-            }
-        };
-        ensureNonEnumerable(Error.prototype, 'message');
-        if (Error.prototype.message !== '') {
-            Error.prototype.message = '';
-        }
-        ensureNonEnumerable(Error.prototype, 'name');
-    }
-
-    if (String(/a/mig) !== '/a/gim') {
-        var regexToString = function toString() {
-            var str = '/' + this.source + '/';
-            if (this.global) {
-                str += 'g';
-            }
-            if (this.ignoreCase) {
-                str += 'i';
-            }
-            if (this.multiline) {
-                str += 'm';
-            }
-            return str;
-        };
-        // can't use defineProperties here because of toString enumeration issue in IE <= 8
-        RegExp.prototype.toString = regexToString;
-    }
-}));
-/*!
- * https://github.com/es-shims/es5-shim
- * @license es5-shim Copyright 2009-2015 by contributors, MIT License
- * see https://github.com/es-shims/es5-shim/blob/master/LICENSE
- */
-
-// vim: ts=4 sts=4 sw=4 expandtab
-
-// Add semicolon to prevent IIFE from being passed as argument to concatenated code.
-;
-
-// UMD (Universal Module Definition)
-// see https://github.com/umdjs/umd/blob/master/templates/returnExports.js
-(function (root, factory) {
-    'use strict';
-
-    /* global define, exports, module */
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(factory);
-    } else if (typeof exports === 'object') {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like enviroments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        // Browser globals (root is window)
-        root.returnExports = factory();
-    }
-}(this, function () {
-
-    var call = Function.call;
-    var prototypeOfObject = Object.prototype;
-    var owns = call.bind(prototypeOfObject.hasOwnProperty);
-    var isEnumerable = call.bind(prototypeOfObject.propertyIsEnumerable);
-    var toStr = call.bind(prototypeOfObject.toString);
-
-    // If JS engine supports accessors creating shortcuts.
-    var defineGetter;
-    var defineSetter;
-    var lookupGetter;
-    var lookupSetter;
-    var supportsAccessors = owns(prototypeOfObject, '__defineGetter__');
-    if (supportsAccessors) {
-        /* eslint-disable no-underscore-dangle */
-        defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-        defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-        lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-        lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-        /* eslint-enable no-underscore-dangle */
-    }
-
-    var isPrimitive = function isPrimitive(o) {
-        return o == null || (typeof o !== 'object' && typeof o !== 'function');
-    };
-
-    // ES5 15.2.3.2
-    // http://es5.github.com/#x15.2.3.2
-    if (!Object.getPrototypeOf) {
-        // https://github.com/es-shims/es5-shim/issues#issue/2
-        // http://ejohn.org/blog/objectgetprototypeof/
-        // recommended by fschaefer on github
-        //
-        // sure, and webreflection says ^_^
-        // ... this will nerever possibly return null
-        // ... Opera Mini breaks here with infinite loops
-        Object.getPrototypeOf = function getPrototypeOf(object) {
-            /* eslint-disable no-proto */
-            var proto = object.__proto__;
-            /* eslint-enable no-proto */
-            if (proto || proto === null) {
-                return proto;
-            } else if (toStr(object.constructor) === '[object Function]') {
-                return object.constructor.prototype;
-            } else if (object instanceof Object) {
-                return prototypeOfObject;
-            } else {
-                // Correctly return null for Objects created with `Object.create(null)`
-                // (shammed or native) or `{ __proto__: null}`.  Also returns null for
-                // cross-realm objects on browsers that lack `__proto__` support (like
-                // IE <11), but that's the best we can do.
-                return null;
-            }
-        };
-    }
-
-    // ES5 15.2.3.3
-    // http://es5.github.com/#x15.2.3.3
-
-    var doesGetOwnPropertyDescriptorWork = function doesGetOwnPropertyDescriptorWork(object) {
-        try {
-            object.sentinel = 0;
-            return Object.getOwnPropertyDescriptor(object, 'sentinel').value === 0;
-        } catch (exception) {
-            return false;
-        }
-    };
-
-    // check whether getOwnPropertyDescriptor works if it's given. Otherwise, shim partially.
-    if (Object.defineProperty) {
-        var getOwnPropertyDescriptorWorksOnObject = doesGetOwnPropertyDescriptorWork({});
-        var getOwnPropertyDescriptorWorksOnDom = typeof document === 'undefined' ||
-        doesGetOwnPropertyDescriptorWork(document.createElement('div'));
-        if (!getOwnPropertyDescriptorWorksOnDom || !getOwnPropertyDescriptorWorksOnObject) {
-            var getOwnPropertyDescriptorFallback = Object.getOwnPropertyDescriptor;
-        }
-    }
-
-    if (!Object.getOwnPropertyDescriptor || getOwnPropertyDescriptorFallback) {
-        var ERR_NON_OBJECT = 'Object.getOwnPropertyDescriptor called on a non-object: ';
-
-        /* eslint-disable no-proto */
-        Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-            if (isPrimitive(object)) {
-                throw new TypeError(ERR_NON_OBJECT + object);
-            }
-
-            // make a valiant attempt to use the real getOwnPropertyDescriptor
-            // for I8's DOM elements.
-            if (getOwnPropertyDescriptorFallback) {
-                try {
-                    return getOwnPropertyDescriptorFallback.call(Object, object, property);
-                } catch (exception) {
-                    // try the shim if the real one doesn't work
-                }
-            }
-
-            var descriptor;
-
-            // If object does not owns property return undefined immediately.
-            if (!owns(object, property)) {
-                return descriptor;
-            }
-
-            // If object has a property then it's for sure `configurable`, and
-            // probably `enumerable`. Detect enumerability though.
-            descriptor = {
-                enumerable: isEnumerable(object, property),
-                configurable: true
-            };
-
-            // If JS engine supports accessor properties then property may be a
-            // getter or setter.
-            if (supportsAccessors) {
-                // Unfortunately `__lookupGetter__` will return a getter even
-                // if object has own non getter property along with a same named
-                // inherited getter. To avoid misbehavior we temporary remove
-                // `__proto__` so that `__lookupGetter__` will return getter only
-                // if it's owned by an object.
-                var prototype = object.__proto__;
-                var notPrototypeOfObject = object !== prototypeOfObject;
-                // avoid recursion problem, breaking in Opera Mini when
-                // Object.getOwnPropertyDescriptor(Object.prototype, 'toString')
-                // or any other Object.prototype accessor
-                if (notPrototypeOfObject) {
-                    object.__proto__ = prototypeOfObject;
-                }
-
-                var getter = lookupGetter(object, property);
-                var setter = lookupSetter(object, property);
-
-                if (notPrototypeOfObject) {
-                    // Once we have getter and setter we can put values back.
-                    object.__proto__ = prototype;
-                }
-
-                if (getter || setter) {
-                    if (getter) {
-                        descriptor.get = getter;
-                    }
-                    if (setter) {
-                        descriptor.set = setter;
-                    }
-                    // If it was accessor property we're done and return here
-                    // in order to avoid adding `value` to the descriptor.
-                    return descriptor;
-                }
-            }
-
-            // If we got this far we know that object has an own property that is
-            // not an accessor so we set it as a value and return descriptor.
-            descriptor.value = object[property];
-            descriptor.writable = true;
-            return descriptor;
-        };
-        /* eslint-enable no-proto */
-    }
-
-    // ES5 15.2.3.4
-    // http://es5.github.com/#x15.2.3.4
-    if (!Object.getOwnPropertyNames) {
-        Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-            return Object.keys(object);
-        };
-    }
-
-    // ES5 15.2.3.5
-    // http://es5.github.com/#x15.2.3.5
-    if (!Object.create) {
-
-        // Contributed by Brandon Benvie, October, 2012
-        var createEmpty;
-        var supportsProto = !({ __proto__: null } instanceof Object);
-                            // the following produces false positives
-                            // in Opera Mini => not a reliable check
-                            // Object.prototype.__proto__ === null
-
-        // Check for document.domain and active x support
-        // No need to use active x approach when document.domain is not set
-        // see https://github.com/es-shims/es5-shim/issues/150
-        // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-        /* global ActiveXObject */
-        var shouldUseActiveX = function shouldUseActiveX() {
-            // return early if document.domain not set
-            if (!document.domain) {
-                return false;
-            }
-
-            try {
-                return !!new ActiveXObject('htmlfile');
-            } catch (exception) {
-                return false;
-            }
-        };
-
-        // This supports IE8 when document.domain is used
-        // see https://github.com/es-shims/es5-shim/issues/150
-        // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-        var getEmptyViaActiveX = function getEmptyViaActiveX() {
-            var empty;
-            var xDoc;
-
-            xDoc = new ActiveXObject('htmlfile');
-
-            var script = 'script';
-            xDoc.write('<' + script + '></' + script + '>');
-            xDoc.close();
-
-            empty = xDoc.parentWindow.Object.prototype;
-            xDoc = null;
-
-            return empty;
-        };
-
-        // The original implementation using an iframe
-        // before the activex approach was added
-        // see https://github.com/es-shims/es5-shim/issues/150
-        var getEmptyViaIFrame = function getEmptyViaIFrame() {
-            var iframe = document.createElement('iframe');
-            var parent = document.body || document.documentElement;
-            var empty;
-
-            iframe.style.display = 'none';
-            parent.appendChild(iframe);
-            /* eslint-disable no-script-url */
-            iframe.src = 'javascript:';
-            /* eslint-enable no-script-url */
-
-            empty = iframe.contentWindow.Object.prototype;
-            parent.removeChild(iframe);
-            iframe = null;
-
-            return empty;
-        };
-
-        /* global document */
-        if (supportsProto || typeof document === 'undefined') {
-            createEmpty = function () {
-                return { __proto__: null };
-            };
-        } else {
-            // In old IE __proto__ can't be used to manually set `null`, nor does
-            // any other method exist to make an object that inherits from nothing,
-            // aside from Object.prototype itself. Instead, create a new global
-            // object and *steal* its Object.prototype and strip it bare. This is
-            // used as the prototype to create nullary objects.
-            createEmpty = function () {
-                // Determine which approach to use
-                // see https://github.com/es-shims/es5-shim/issues/150
-                var empty = shouldUseActiveX() ? getEmptyViaActiveX() : getEmptyViaIFrame();
-
-                delete empty.constructor;
-                delete empty.hasOwnProperty;
-                delete empty.propertyIsEnumerable;
-                delete empty.isPrototypeOf;
-                delete empty.toLocaleString;
-                delete empty.toString;
-                delete empty.valueOf;
-
-                var Empty = function Empty() {};
-                Empty.prototype = empty;
-                // short-circuit future calls
-                createEmpty = function () {
-                    return new Empty();
-                };
-                return new Empty();
-            };
-        }
-
-        Object.create = function create(prototype, properties) {
-
-            var object;
-            var Type = function Type() {}; // An empty constructor.
-
-            if (prototype === null) {
-                object = createEmpty();
-            } else {
-                if (prototype !== null && isPrimitive(prototype)) {
-                    // In the native implementation `parent` can be `null`
-                    // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
-                    // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
-                    // like they are in modern browsers. Using `Object.create` on DOM elements
-                    // is...err...probably inappropriate, but the native version allows for it.
-                    throw new TypeError('Object prototype may only be an Object or null'); // same msg as Chrome
-                }
-                Type.prototype = prototype;
-                object = new Type();
-                // IE has no built-in implementation of `Object.getPrototypeOf`
-                // neither `__proto__`, but this manually setting `__proto__` will
-                // guarantee that `Object.getPrototypeOf` will work as expected with
-                // objects created using `Object.create`
-                /* eslint-disable no-proto */
-                object.__proto__ = prototype;
-                /* eslint-enable no-proto */
-            }
-
-            if (properties !== void 0) {
-                Object.defineProperties(object, properties);
-            }
-
-            return object;
-        };
-    }
-
-    // ES5 15.2.3.6
-    // http://es5.github.com/#x15.2.3.6
-
-    // Patch for WebKit and IE8 standard mode
-    // Designed by hax <hax.github.com>
-    // related issue: https://github.com/es-shims/es5-shim/issues#issue/5
-    // IE8 Reference:
-    //     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-    //     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-    // WebKit Bugs:
-    //     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-    var doesDefinePropertyWork = function doesDefinePropertyWork(object) {
-        try {
-            Object.defineProperty(object, 'sentinel', {});
-            return 'sentinel' in object;
-        } catch (exception) {
-            return false;
-        }
-    };
-
-    // check whether defineProperty works if it's given. Otherwise,
-    // shim partially.
-    if (Object.defineProperty) {
-        var definePropertyWorksOnObject = doesDefinePropertyWork({});
-        var definePropertyWorksOnDom = typeof document === 'undefined' ||
-            doesDefinePropertyWork(document.createElement('div'));
-        if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-            var definePropertyFallback = Object.defineProperty,
-                definePropertiesFallback = Object.defineProperties;
-        }
-    }
-
-    if (!Object.defineProperty || definePropertyFallback) {
-        var ERR_NON_OBJECT_DESCRIPTOR = 'Property description must be an object: ';
-        var ERR_NON_OBJECT_TARGET = 'Object.defineProperty called on non-object: ';
-        var ERR_ACCESSORS_NOT_SUPPORTED = 'getters & setters can not be defined on this javascript engine';
-
-        Object.defineProperty = function defineProperty(object, property, descriptor) {
-            if (isPrimitive(object)) {
-                throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-            }
-            if (isPrimitive(descriptor)) {
-                throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-            }
-            // make a valiant attempt to use the real defineProperty
-            // for I8's DOM elements.
-            if (definePropertyFallback) {
-                try {
-                    return definePropertyFallback.call(Object, object, property, descriptor);
-                } catch (exception) {
-                    // try the shim if the real one doesn't work
-                }
-            }
-
-            // If it's a data property.
-            if ('value' in descriptor) {
-                // fail silently if 'writable', 'enumerable', or 'configurable'
-                // are requested but not supported
-                /*
-                // alternate approach:
-                if ( // can't implement these features; allow false but not true
-                    ('writable' in descriptor && !descriptor.writable) ||
-                    ('enumerable' in descriptor && !descriptor.enumerable) ||
-                    ('configurable' in descriptor && !descriptor.configurable)
-                ))
-                    throw new RangeError(
-                        'This implementation of Object.defineProperty does not support configurable, enumerable, or writable.'
-                    );
-                */
-
-                if (supportsAccessors && (lookupGetter(object, property) || lookupSetter(object, property))) {
-                    // As accessors are supported only on engines implementing
-                    // `__proto__` we can safely override `__proto__` while defining
-                    // a property to make sure that we don't hit an inherited
-                    // accessor.
-                    /* eslint-disable no-proto */
-                    var prototype = object.__proto__;
-                    object.__proto__ = prototypeOfObject;
-                    // Deleting a property anyway since getter / setter may be
-                    // defined on object itself.
-                    delete object[property];
-                    object[property] = descriptor.value;
-                    // Setting original `__proto__` back now.
-                    object.__proto__ = prototype;
-                    /* eslint-enable no-proto */
-                } else {
-                    object[property] = descriptor.value;
-                }
-            } else {
-                var hasGetter = 'get' in descriptor;
-                var hasSetter = 'set' in descriptor;
-                if (!supportsAccessors && (hasGetter || hasSetter)) {
-                    throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-                }
-                // If we got that far then getters and setters can be defined !!
-                if (hasGetter) {
-                    defineGetter(object, property, descriptor.get);
-                }
-                if (hasSetter) {
-                    defineSetter(object, property, descriptor.set);
-                }
-            }
-            return object;
-        };
-    }
-
-    // ES5 15.2.3.7
-    // http://es5.github.com/#x15.2.3.7
-    if (!Object.defineProperties || definePropertiesFallback) {
-        Object.defineProperties = function defineProperties(object, properties) {
-            // make a valiant attempt to use the real defineProperties
-            if (definePropertiesFallback) {
-                try {
-                    return definePropertiesFallback.call(Object, object, properties);
-                } catch (exception) {
-                    // try the shim if the real one doesn't work
-                }
-            }
-
-            Object.keys(properties).forEach(function (property) {
-                if (property !== '__proto__') {
-                    Object.defineProperty(object, property, properties[property]);
-                }
-            });
-            return object;
-        };
-    }
-
-    // ES5 15.2.3.8
-    // http://es5.github.com/#x15.2.3.8
-    if (!Object.seal) {
-        Object.seal = function seal(object) {
-            if (Object(object) !== object) {
-                throw new TypeError('Object.seal can only be called on Objects.');
-            }
-            // this is misleading and breaks feature-detection, but
-            // allows "securable" code to "gracefully" degrade to working
-            // but insecure code.
-            return object;
-        };
-    }
-
-    // ES5 15.2.3.9
-    // http://es5.github.com/#x15.2.3.9
-    if (!Object.freeze) {
-        Object.freeze = function freeze(object) {
-            if (Object(object) !== object) {
-                throw new TypeError('Object.freeze can only be called on Objects.');
-            }
-            // this is misleading and breaks feature-detection, but
-            // allows "securable" code to "gracefully" degrade to working
-            // but insecure code.
-            return object;
-        };
-    }
-
-    // detect a Rhino bug and patch it
-    try {
-        Object.freeze(function () {});
-    } catch (exception) {
-        Object.freeze = (function (freezeObject) {
-            return function freeze(object) {
-                if (typeof object === 'function') {
-                    return object;
-                } else {
-                    return freezeObject(object);
-                }
-            };
-        }(Object.freeze));
-    }
-
-    // ES5 15.2.3.10
-    // http://es5.github.com/#x15.2.3.10
-    if (!Object.preventExtensions) {
-        Object.preventExtensions = function preventExtensions(object) {
-            if (Object(object) !== object) {
-                throw new TypeError('Object.preventExtensions can only be called on Objects.');
-            }
-            // this is misleading and breaks feature-detection, but
-            // allows "securable" code to "gracefully" degrade to working
-            // but insecure code.
-            return object;
-        };
-    }
-
-    // ES5 15.2.3.11
-    // http://es5.github.com/#x15.2.3.11
-    if (!Object.isSealed) {
-        Object.isSealed = function isSealed(object) {
-            if (Object(object) !== object) {
-                throw new TypeError('Object.isSealed can only be called on Objects.');
-            }
-            return false;
-        };
-    }
-
-    // ES5 15.2.3.12
-    // http://es5.github.com/#x15.2.3.12
-    if (!Object.isFrozen) {
-        Object.isFrozen = function isFrozen(object) {
-            if (Object(object) !== object) {
-                throw new TypeError('Object.isFrozen can only be called on Objects.');
-            }
-            return false;
-        };
-    }
-
-    // ES5 15.2.3.13
-    // http://es5.github.com/#x15.2.3.13
-    if (!Object.isExtensible) {
-        Object.isExtensible = function isExtensible(object) {
-            // 1. If Type(O) is not Object throw a TypeError exception.
-            if (Object(object) !== object) {
-                throw new TypeError('Object.isExtensible can only be called on Objects.');
-            }
-            // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-            var name = '';
-            while (owns(object, name)) {
-                name += '?';
-            }
-            object[name] = true;
-            var returnValue = owns(object, name);
-            delete object[name];
-            return returnValue;
-        };
-    }
-
-}));
diff --git a/packages/es5-shim/es5-shim-sham.min.js b/packages/es5-shim/es5-shim-sham.min.js
deleted file mode 100644
index a1ddf1c54c..0000000000
--- a/packages/es5-shim/es5-shim-sham.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t,e){"use strict";"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e():t.returnExports=e()}(this,function(){var t=Array,e=t.prototype,r=Object,n=r.prototype,o=Function,i=o.prototype,a=String,c=a.prototype,u=Number,l=u.prototype,f=e.slice,s=e.splice,p=e.push,h=e.unshift,y=e.concat,d=e.join,b=i.call,v=i.apply,g=Math.max,w=Math.min,O=n.toString,j="function"==typeof Symbol&&"symbol"==typeof Symbol.toStringTag,T,m=Function.prototype.toString,D=/^\s*class /,E=function t(e){try{var r=m.call(e).replace(/\/\/.*\n/g,"").replace(/\/\*[.\s\S]*\*\//g,"").replace(/\n/gm," ").replace(/ {2}/g," ");return D.test(r)}catch(t){return!1}},x=function t(e){try{return!E(e)&&(m.call(e),!0)}catch(t){return!1}},S="[object Function]",_="[object GeneratorFunction]",T=function t(e){if(!e)return!1;if("function"!=typeof e&&"object"!=typeof e)return!1;if(j)return x(e);if(E(e))return!1;var r=O.call(e);return r===S||r===_},M,I=RegExp.prototype.exec,P=function t(e){try{return I.call(e),!0}catch(t){return!1}},F="[object RegExp]";M=function t(e){return"object"==typeof e&&(j?P(e):O.call(e)===F)};var U,N=String.prototype.valueOf,k=function t(e){try{return N.call(e),!0}catch(t){return!1}},C="[object String]";U=function t(e){return"string"==typeof e||"object"==typeof e&&(j?k(e):O.call(e)===C)};var A=r.defineProperty&&function(){try{var t={};r.defineProperty(t,"x",{enumerable:!1,value:t});for(var e in t)return!1;return t.x===t}catch(t){return!1}}(),R=function(t){var e;return e=A?function(t,e,n,o){!o&&e in t||r.defineProperty(t,e,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(t,e,r,n){!n&&e in t||(t[e]=r)},function r(n,o,i){for(var a in o)t.call(o,a)&&e(n,a,o[a],i)}}(n.hasOwnProperty),$=function t(e){var r=typeof e;return null===e||"object"!==r&&"function"!==r},z=u.isNaN||function t(e){return e!==e},J={ToInteger:function t(e){var r=+e;return z(r)?r=0:0!==r&&r!==1/0&&r!==-1/0&&(r=(r>0||-1)*Math.floor(Math.abs(r))),r},ToPrimitive:function t(e){var r,n,o;if($(e))return e;if(n=e.valueOf,T(n)&&(r=n.call(e),$(r)))return r;if(o=e.toString,T(o)&&(r=o.call(e),$(r)))return r;throw new TypeError},ToObject:function(t){if(null==t)throw new TypeError("can't convert "+t+" to object");return r(t)},ToUint32:function t(e){return e>>>0}},G=function t(){};R(i,{bind:function t(e){var n=this;if(!T(n))throw new TypeError("Function.prototype.bind called on incompatible "+n);for(var i=f.call(arguments,1),a,c=function(){if(this instanceof a){var t=v.call(n,this,y.call(i,f.call(arguments)));return r(t)===t?t:this}return v.call(n,e,y.call(i,f.call(arguments)))},u=g(0,n.length-i.length),l=[],s=0;s<u;s++)p.call(l,"$"+s);return a=o("binder","return function ("+d.call(l,",")+"){ return binder.apply(this, arguments); }")(c),n.prototype&&(G.prototype=n.prototype,a.prototype=new G,G.prototype=null),a}});var Z=b.bind(n.hasOwnProperty),Y=b.bind(n.toString),W=b.bind(f),X=v.bind(f),B=b.bind(c.slice),H=b.bind(c.split),L=b.bind(c.indexOf),q=b.bind(p),K=b.bind(n.propertyIsEnumerable),Q=b.bind(e.sort),V=t.isArray||function t(e){return"[object Array]"===Y(e)},tt=1!==[].unshift(0);R(e,{unshift:function(){return h.apply(this,arguments),this.length}},tt),R(t,{isArray:V});var et=r("a"),rt="a"!==et[0]||!(0 in et),nt=function t(e){var r=!0,n=!0,o=!1;if(e)try{e.call("foo",function(t,e,n){"object"!=typeof n&&(r=!1)}),e.call([1],function(){"use strict";n="string"==typeof this},"x")}catch(t){o=!0}return!!e&&!o&&r&&n};R(e,{forEach:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=-1,i=J.ToUint32(n.length),a;if(arguments.length>1&&(a=arguments[1]),!T(e))throw new TypeError("Array.prototype.forEach callback must be a function");for(;++o<i;)o in n&&(void 0===a?e(n[o],o,r):e.call(a,n[o],o,r))}},!nt(e.forEach)),R(e,{map:function e(r){var n=J.ToObject(this),o=rt&&U(this)?H(this,""):n,i=J.ToUint32(o.length),a=t(i),c;if(arguments.length>1&&(c=arguments[1]),!T(r))throw new TypeError("Array.prototype.map callback must be a function");for(var u=0;u<i;u++)u in o&&(a[u]=void 0===c?r(o[u],u,n):r.call(c,o[u],u,n));return a}},!nt(e.map)),R(e,{filter:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=J.ToUint32(n.length),i=[],a,c;if(arguments.length>1&&(c=arguments[1]),!T(e))throw new TypeError("Array.prototype.filter callback must be a function");for(var u=0;u<o;u++)u in n&&(a=n[u],(void 0===c?e(a,u,r):e.call(c,a,u,r))&&q(i,a));return i}},!nt(e.filter)),R(e,{every:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=J.ToUint32(n.length),i;if(arguments.length>1&&(i=arguments[1]),!T(e))throw new TypeError("Array.prototype.every callback must be a function");for(var a=0;a<o;a++)if(a in n&&!(void 0===i?e(n[a],a,r):e.call(i,n[a],a,r)))return!1;return!0}},!nt(e.every)),R(e,{some:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=J.ToUint32(n.length),i;if(arguments.length>1&&(i=arguments[1]),!T(e))throw new TypeError("Array.prototype.some callback must be a function");for(var a=0;a<o;a++)if(a in n&&(void 0===i?e(n[a],a,r):e.call(i,n[a],a,r)))return!0;return!1}},!nt(e.some));var ot=!1;e.reduce&&(ot="object"==typeof e.reduce.call("es5",function(t,e,r,n){return n})),R(e,{reduce:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=J.ToUint32(n.length);if(!T(e))throw new TypeError("Array.prototype.reduce callback must be a function");if(0===o&&1===arguments.length)throw new TypeError("reduce of empty array with no initial value");var i=0,a;if(arguments.length>=2)a=arguments[1];else for(;;){if(i in n){a=n[i++];break}if(++i>=o)throw new TypeError("reduce of empty array with no initial value")}for(;i<o;i++)i in n&&(a=e(a,n[i],i,r));return a}},!ot);var it=!1;e.reduceRight&&(it="object"==typeof e.reduceRight.call("es5",function(t,e,r,n){return n})),R(e,{reduceRight:function t(e){var r=J.ToObject(this),n=rt&&U(this)?H(this,""):r,o=J.ToUint32(n.length);if(!T(e))throw new TypeError("Array.prototype.reduceRight callback must be a function");if(0===o&&1===arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var i,a=o-1;if(arguments.length>=2)i=arguments[1];else for(;;){if(a in n){i=n[a--];break}if(--a<0)throw new TypeError("reduceRight of empty array with no initial value")}if(a<0)return i;do{a in n&&(i=e(i,n[a],a,r))}while(a--);return i}},!it);var at=e.indexOf&&-1!==[0,1].indexOf(1,2);R(e,{indexOf:function t(e){var r=rt&&U(this)?H(this,""):J.ToObject(this),n=J.ToUint32(r.length);if(0===n)return-1;var o=0;for(arguments.length>1&&(o=J.ToInteger(arguments[1])),o=o>=0?o:g(0,n+o);o<n;o++)if(o in r&&r[o]===e)return o;return-1}},at);var ct=e.lastIndexOf&&-1!==[0,1].lastIndexOf(0,-3);R(e,{lastIndexOf:function t(e){var r=rt&&U(this)?H(this,""):J.ToObject(this),n=J.ToUint32(r.length);if(0===n)return-1;var o=n-1;for(arguments.length>1&&(o=w(o,J.ToInteger(arguments[1]))),o=o>=0?o:n-Math.abs(o);o>=0;o--)if(o in r&&e===r[o])return o;return-1}},ct);var ut=function(){var t=[1,2],e=t.splice();return 2===t.length&&V(e)&&0===e.length}();R(e,{splice:function t(e,r){return 0===arguments.length?[]:s.apply(this,arguments)}},!ut);var lt=function(){var t={};return e.splice.call(t,0,0,1),1===t.length}();R(e,{splice:function t(e,r){if(0===arguments.length)return[];var n=arguments;return this.length=g(J.ToInteger(this.length),0),arguments.length>0&&"number"!=typeof r&&((n=W(arguments)).length<2?q(n,this.length-e):n[1]=J.ToInteger(r)),s.apply(this,n)}},!lt);var ft=function(){var e=new t(1e5);return e[8]="x",e.splice(1,1),7===e.indexOf("x")}(),st=function(){var t=256,e=[];return e[t]="a",e.splice(257,0,"b"),"a"===e[t]}();R(e,{splice:function t(e,r){for(var n=J.ToObject(this),o=[],i=J.ToUint32(n.length),c=J.ToInteger(e),u=c<0?g(i+c,0):w(c,i),l=w(g(J.ToInteger(r),0),i-u),f=0,s;f<l;)s=a(u+f),Z(n,s)&&(o[f]=n[s]),f+=1;var p=W(arguments,2),h=p.length,y;if(h<l){f=u;for(var d=i-l;f<d;)s=a(f+l),y=a(f+h),Z(n,s)?n[y]=n[s]:delete n[y],f+=1;f=i;for(var b=i-l+h;f>b;)delete n[f-1],f-=1}else if(h>l)for(f=i-l;f>u;)s=a(f+l-1),y=a(f+h-1),Z(n,s)?n[y]=n[s]:delete n[y],f-=1;f=u;for(var v=0;v<p.length;++v)n[f]=p[v],f+=1;return n.length=i-l+h,o}},!ft||!st);var pt=e.join,ht;try{ht="1,2,3"!==Array.prototype.join.call("123",",")}catch(t){ht=!0}ht&&R(e,{join:function t(e){var r=void 0===e?",":e;return pt.call(U(this)?H(this,""):this,r)}},ht);var yt="1,2"!==[1,2].join(void 0);yt&&R(e,{join:function t(e){var r=void 0===e?",":e;return pt.call(this,r)}},yt);var dt=function t(e){for(var r=J.ToObject(this),n=J.ToUint32(r.length),o=0;o<arguments.length;)r[n+o]=arguments[o],o+=1;return r.length=n+o,n+o},bt=function(){var t={};return 1!==Array.prototype.push.call(t,void 0)||1!==t.length||void 0!==t[0]||!Z(t,0)}();R(e,{push:function t(e){return V(this)?p.apply(this,arguments):dt.apply(this,arguments)}},bt);var vt=function(){var t=[];return 1!==t.push(void 0)||1!==t.length||void 0!==t[0]||!Z(t,0)}();R(e,{push:dt},vt),R(e,{slice:function(t,e){var r=U(this)?H(this,""):this;return X(r,arguments)}},rt);var gt=function(){try{return[1,2].sort(null),[1,2].sort({}),!0}catch(t){}return!1}(),wt=function(){try{return[1,2].sort(/a/),!1}catch(t){}return!0}(),Ot=function(){try{return[1,2].sort(void 0),!0}catch(t){}return!1}();R(e,{sort:function t(e){if(void 0===e)return Q(this);if(!T(e))throw new TypeError("Array.prototype.sort callback must be a function");return Q(this,e)}},gt||!Ot||!wt);var jt=!K({toString:null},"toString"),Tt=K(function(){},"prototype"),mt=!Z("x","0"),Dt=function(t){var e=t.constructor;return e&&e.prototype===t},Et={$window:!0,$console:!0,$parent:!0,$self:!0,$frame:!0,$frames:!0,$frameElement:!0,$webkitIndexedDB:!0,$webkitStorageInfo:!0,$external:!0},xt=function(){if("undefined"==typeof window)return!1;for(var t in window)try{!Et["$"+t]&&Z(window,t)&&null!==window[t]&&"object"==typeof window[t]&&Dt(window[t])}catch(t){return!0}return!1}(),St=function(t){if("undefined"==typeof window||!xt)return Dt(t);try{return Dt(t)}catch(t){return!1}},_t=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],Mt=_t.length,It=function t(e){return"[object Arguments]"===Y(e)},Pt=function t(e){return null!==e&&"object"==typeof e&&"number"==typeof e.length&&e.length>=0&&!V(e)&&T(e.callee)},Ft=It(arguments)?It:Pt;R(r,{keys:function t(e){var r=T(e),n=Ft(e),o=null!==e&&"object"==typeof e,i=o&&U(e);if(!o&&!r&&!n)throw new TypeError("Object.keys called on a non-object");var c=[],u=Tt&&r;if(i&&mt||n)for(var l=0;l<e.length;++l)q(c,a(l));if(!n)for(var f in e)u&&"prototype"===f||!Z(e,f)||q(c,a(f));if(jt)for(var s=St(e),p=0;p<Mt;p++){var h=_t[p];s&&"constructor"===h||!Z(e,h)||q(c,h)}return c}});var Ut=r.keys&&function(){return 2===r.keys(arguments).length}(1,2),Nt=r.keys&&function(){var t=r.keys(arguments);return 1!==arguments.length||1!==t.length||1!==t[0]}(1),kt=r.keys;R(r,{keys:function t(e){return kt(Ft(e)?W(e):e)}},!Ut||Nt);var Ct=0!==new Date(-0xc782b5b342b24).getUTCMonth(),At=new Date(-0x55d318d56a724),Rt=new Date(14496624e5),$t="Mon, 01 Jan -45875 11:59:59 GMT"!==At.toUTCString(),zt,Jt;At.getTimezoneOffset()<-720?(zt="Tue Jan 02 -45875"!==At.toDateString(),Jt=!/^Thu Dec 10 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(Rt.toString())):(zt="Mon Jan 01 -45875"!==At.toDateString(),Jt=!/^Wed Dec 09 2015 \d\d:\d\d:\d\d GMT[-\+]\d\d\d\d(?: |$)/.test(Rt.toString()));var Gt=b.bind(Date.prototype.getFullYear),Zt=b.bind(Date.prototype.getMonth),Yt=b.bind(Date.prototype.getDate),Wt=b.bind(Date.prototype.getUTCFullYear),Xt=b.bind(Date.prototype.getUTCMonth),Bt=b.bind(Date.prototype.getUTCDate),Ht=b.bind(Date.prototype.getUTCDay),Lt=b.bind(Date.prototype.getUTCHours),qt=b.bind(Date.prototype.getUTCMinutes),Kt=b.bind(Date.prototype.getUTCSeconds),Qt=b.bind(Date.prototype.getUTCMilliseconds),Vt=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],te=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],ee=function t(e,r){return Yt(new Date(r,e,0))};R(Date.prototype,{getFullYear:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Gt(this);return e<0&&Zt(this)>11?e+1:e},getMonth:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Gt(this),r=Zt(this);return e<0&&r>11?0:r},getDate:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Gt(this),r=Zt(this),n=Yt(this);return e<0&&r>11?12===r?n:ee(0,e+1)-n+1:n},getUTCFullYear:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Wt(this);return e<0&&Xt(this)>11?e+1:e},getUTCMonth:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Wt(this),r=Xt(this);return e<0&&r>11?0:r},getUTCDate:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Wt(this),r=Xt(this),n=Bt(this);return e<0&&r>11?12===r?n:ee(0,e+1)-n+1:n}},Ct),R(Date.prototype,{toUTCString:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=Ht(this),r=Bt(this),n=Xt(this),o=Wt(this),i=Lt(this),a=qt(this),c=Kt(this);return Vt[e]+", "+(r<10?"0"+r:r)+" "+te[n]+" "+o+" "+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+":"+(c<10?"0"+c:c)+" GMT"}},Ct||$t),R(Date.prototype,{toDateString:function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=this.getDay(),r=this.getDate(),n=this.getMonth(),o=this.getFullYear();return Vt[e]+" "+te[n]+" "+(r<10?"0"+r:r)+" "+o}},Ct||zt),(Ct||Jt)&&(Date.prototype.toString=function t(){if(!(this&&this instanceof Date))throw new TypeError("this is not a Date object.");var e=this.getDay(),r=this.getDate(),n=this.getMonth(),o=this.getFullYear(),i=this.getHours(),a=this.getMinutes(),c=this.getSeconds(),u=this.getTimezoneOffset(),l=Math.floor(Math.abs(u)/60),f=Math.floor(Math.abs(u)%60);return Vt[e]+" "+te[n]+" "+(r<10?"0"+r:r)+" "+o+" "+(i<10?"0"+i:i)+":"+(a<10?"0"+a:a)+":"+(c<10?"0"+c:c)+" GMT"+(u>0?"-":"+")+(l<10?"0"+l:l)+(f<10?"0"+f:f)},A&&r.defineProperty(Date.prototype,"toString",{configurable:!0,enumerable:!1,writable:!0}));var re=-621987552e5,ne="-000001",oe=Date.prototype.toISOString&&-1===new Date(-621987552e5).toISOString().indexOf("-000001"),ie=Date.prototype.toISOString&&"1969-12-31T23:59:59.999Z"!==new Date(-1).toISOString(),ae=b.bind(Date.prototype.getTime);R(Date.prototype,{toISOString:function t(){if(!isFinite(this)||!isFinite(ae(this)))throw new RangeError("Date.prototype.toISOString called on non-finite value.");var e=Wt(this),r=Xt(this);e+=Math.floor(r/12);var n=[(r=(r%12+12)%12)+1,Bt(this),Lt(this),qt(this),Kt(this)];e=(e<0?"-":e>9999?"+":"")+B("00000"+Math.abs(e),0<=e&&e<=9999?-4:-6);for(var o=0;o<n.length;++o)n[o]=B("00"+n[o],-2);return e+"-"+W(n,0,2).join("-")+"T"+W(n,2).join(":")+"."+B("000"+Qt(this),-3)+"Z"}},oe||ie),function(){try{return Date.prototype.toJSON&&null===new Date(NaN).toJSON()&&-1!==new Date(-621987552e5).toJSON().indexOf("-000001")&&Date.prototype.toJSON.call({toISOString:function(){return!0}})}catch(t){return!1}}()||(Date.prototype.toJSON=function t(e){var n=r(this),o=J.ToPrimitive(n);if("number"==typeof o&&!isFinite(o))return null;var i=n.toISOString;if(!T(i))throw new TypeError("toISOString property is not callable");return i.call(n)});var ce=1e15===Date.parse("+033658-09-27T01:46:40.000Z"),ue=!isNaN(Date.parse("2012-04-04T24:00:00.500Z"))||!isNaN(Date.parse("2012-11-31T23:59:59.000Z"))||!isNaN(Date.parse("2012-12-31T23:59:60.000Z"));if(isNaN(Date.parse("2000-01-01T00:00:00.000Z"))||ue||!ce){var le=Math.pow(2,31)-1,fe=z(new Date(1970,0,1,0,0,0,le+1).getTime());Date=function(t){var e=function r(n,o,i,c,u,l,f){var s=arguments.length,p;if(this instanceof t){var h=l,y=f;if(fe&&s>=7&&f>le){var d=Math.floor(f/le)*le,b=Math.floor(d/1e3);h+=b,y-=1e3*b}p=1===s&&a(n)===n?new t(e.parse(n)):s>=7?new t(n,o,i,c,u,h,y):s>=6?new t(n,o,i,c,u,h):s>=5?new t(n,o,i,c,u):s>=4?new t(n,o,i,c):s>=3?new t(n,o,i):s>=2?new t(n,o):s>=1?new t(n instanceof t?+n:n):new t}else p=t.apply(this,arguments);return $(p)||R(p,{constructor:e},!0),p},r=new RegExp("^(\\d{4}|[+-]\\d{6})(?:-(\\d{2})(?:-(\\d{2})(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:(\\.\\d{1,}))?)?(Z|(?:([-+])(\\d{2}):(\\d{2})))?)?)?)?$"),n=[0,31,59,90,120,151,181,212,243,273,304,334,365],o=function t(e,r){var o=r>1?1:0;return n[r]+Math.floor((e-1969+o)/4)-Math.floor((e-1901+o)/100)+Math.floor((e-1601+o)/400)+365*(e-1970)},i=function e(r){var n=0,o=r;if(fe&&o>le){var i=Math.floor(o/le)*le,a=Math.floor(i/1e3);n+=a,o-=1e3*a}return u(new t(1970,0,1,0,0,n,o))};for(var c in t)Z(t,c)&&(e[c]=t[c]);return R(e,{now:t.now,UTC:t.UTC},!0),e.prototype=t.prototype,R(e.prototype,{constructor:e},!0),R(e,{parse:function e(n){var a=r.exec(n);if(a){var c=u(a[1]),l=u(a[2]||1)-1,f=u(a[3]||1)-1,s=u(a[4]||0),p=u(a[5]||0),h=u(a[6]||0),y=Math.floor(1e3*u(a[7]||0)),d=Boolean(a[4]&&!a[8]),b="-"===a[9]?1:-1,v=u(a[10]||0),g=u(a[11]||0),w;return s<(p>0||h>0||y>0?24:25)&&p<60&&h<60&&y<1e3&&l>-1&&l<12&&v<24&&g<60&&f>-1&&f<o(c,l+1)-o(c,l)&&(w=60*(24*(o(c,l)+f)+s+v*b),w=1e3*(60*(w+p+g*b)+h)+y,d&&(w=i(w)),-864e13<=w&&w<=864e13)?w:NaN}return t.parse.apply(this,arguments)}}),e}(Date)}Date.now||(Date.now=function t(){return(new Date).getTime()});var se=l.toFixed&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0)),pe={base:1e7,size:6,data:[0,0,0,0,0,0],multiply:function t(e,r){for(var n=-1,o=r;++n<pe.size;)o+=e*pe.data[n],pe.data[n]=o%pe.base,o=Math.floor(o/pe.base)},divide:function t(e){for(var r=pe.size,n=0;--r>=0;)n+=pe.data[r],pe.data[r]=Math.floor(n/e),n=n%e*pe.base},numToString:function t(){for(var e=pe.size,r="";--e>=0;)if(""!==r||0===e||0!==pe.data[e]){var n=a(pe.data[e]);""===r?r=n:r+=B("0000000",0,7-n.length)+n}return r},pow:function t(e,r,n){return 0===r?n:r%2==1?t(e,r-1,n*e):t(e*e,r/2,n)},log:function t(e){for(var r=0,n=e;n>=4096;)r+=12,n/=4096;for(;n>=2;)r+=1,n/=2;return r}};R(l,{toFixed:function t(e){var r,n,o,i,c,l,f,s;if(r=u(e),(r=z(r)?0:Math.floor(r))<0||r>20)throw new RangeError("Number.toFixed called with invalid number of decimals");if(n=u(this),z(n))return"NaN";if(n<=-1e21||n>=1e21)return a(n);if(o="",n<0&&(o="-",n=-n),i="0",n>1e-21)if(c=pe.log(n*pe.pow(2,69,1))-69,l=c<0?n*pe.pow(2,-c,1):n/pe.pow(2,c,1),l*=4503599627370496,(c=52-c)>0){for(pe.multiply(0,l),f=r;f>=7;)pe.multiply(1e7,0),f-=7;for(pe.multiply(pe.pow(10,f,1),0),f=c-1;f>=23;)pe.divide(1<<23),f-=23;pe.divide(1<<f),pe.multiply(1,1),pe.divide(2),i=pe.numToString()}else pe.multiply(0,l),pe.multiply(1<<-c,0),i=pe.numToString()+B("0.00000000000000000000",2,2+r);return i=r>0?(s=i.length)<=r?o+B("0.0000000000000000000",0,r-s+2)+i:o+B(i,0,s-r)+"."+B(i,s-r):o+i}},se);var he=function(){try{return"1"===1..toPrecision(void 0)}catch(t){return!0}}(),ye=l.toPrecision;R(l,{toPrecision:function t(e){return void 0===e?ye.call(this):ye.call(this,e)}},he),2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?function(){var t=void 0===/()??/.exec("")[1],e=Math.pow(2,32)-1;c.split=function(r,n){var o=String(this);if(void 0===r&&0===n)return[];if(!M(r))return H(this,r,n);var i=[],a=(r.ignoreCase?"i":"")+(r.multiline?"m":"")+(r.unicode?"u":"")+(r.sticky?"y":""),c=0,u,l,f,s,h=new RegExp(r.source,a+"g");t||(u=new RegExp("^"+h.source+"$(?!\\s)",a));var y=void 0===n?e:J.ToUint32(n);for(l=h.exec(o);l&&!((f=l.index+l[0].length)>c&&(q(i,B(o,c,l.index)),!t&&l.length>1&&l[0].replace(u,function(){for(var t=1;t<arguments.length-2;t++)void 0===arguments[t]&&(l[t]=void 0)}),l.length>1&&l.index<o.length&&p.apply(i,W(l,1)),s=l[0].length,c=f,i.length>=y));)h.lastIndex===l.index&&h.lastIndex++,l=h.exec(o);return c===o.length?!s&&h.test("")||q(i,""):q(i,B(o,c)),i.length>y?W(i,0,y):i}}():"0".split(void 0,0).length&&(c.split=function t(e,r){return void 0===e&&0===r?[]:H(this,e,r)});var de=c.replace;(function(){var t=[];return"x".replace(/x(.)?/g,function(e,r){q(t,r)}),1===t.length&&void 0===t[0]})()||(c.replace=function t(e,r){var n=T(r),o=M(e)&&/\)[*?]/.test(e.source);if(n&&o){var i=function(t){var n=arguments.length,o=e.lastIndex;e.lastIndex=0;var i=e.exec(t)||[];return e.lastIndex=o,q(i,arguments[n-2],arguments[n-1]),r.apply(this,i)};return de.call(this,e,i)}return de.call(this,e,r)});var be=c.substr,ve="".substr&&"b"!=="0b".substr(-1);R(c,{substr:function t(e,r){var n=e;return e<0&&(n=g(this.length+e,0)),be.call(this,n,r)}},ve);var ge="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff",we="​",Oe="["+ge+"]",je=new RegExp("^"+Oe+Oe+"*"),Te=new RegExp(Oe+Oe+"*$"),me=c.trim&&(ge.trim()||!"​".trim());R(c,{trim:function t(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");return a(this).replace(je,"").replace(Te,"")}},me);var De=b.bind(String.prototype.trim),Ee=c.lastIndexOf&&-1!=="abcあい".lastIndexOf("あい",2);R(c,{lastIndexOf:function t(e){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");for(var r=a(this),n=a(e),o=arguments.length>1?u(arguments[1]):NaN,i=z(o)?1/0:J.ToInteger(o),c=w(g(i,0),r.length),l=n.length,f=c+l;f>0;){f=g(0,f-l);var s=L(B(r,f,c+l),n);if(-1!==s)return f+s}return-1}},Ee);var xe=c.lastIndexOf;if(R(c,{lastIndexOf:function t(e){return xe.apply(this,arguments)}},1!==c.lastIndexOf.length),8===parseInt(ge+"08")&&22===parseInt(ge+"0x16")||(parseInt=function(t){var e=/^[\-+]?0[xX]/;return function r(n,o){var i=De(String(n)),a=u(o)||(e.test(i)?16:10);return t(i,a)}}(parseInt)),1/parseFloat("-0")!=-1/0&&(parseFloat=function(t){return function e(r){var n=De(String(r)),o=t(n);return 0===o&&"-"===B(n,0,1)?-0:o}}(parseFloat)),"RangeError: test"!==String(new RangeError("test"))){var Se=function t(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");var e=this.name;void 0===e?e="Error":"string"!=typeof e&&(e=a(e));var r=this.message;return void 0===r?r="":"string"!=typeof r&&(r=a(r)),e?r?e+": "+r:e:r};Error.prototype.toString=Se}if(A){var _e=function(t,e){if(K(t,e)){var r=Object.getOwnPropertyDescriptor(t,e);r.configurable&&(r.enumerable=!1,Object.defineProperty(t,e,r))}};_e(Error.prototype,"message"),""!==Error.prototype.message&&(Error.prototype.message=""),_e(Error.prototype,"name")}if("/a/gim"!==String(/a/gim)){var Me=function t(){var e="/"+this.source+"/";return this.global&&(e+="g"),this.ignoreCase&&(e+="i"),this.multiline&&(e+="m"),e};RegExp.prototype.toString=Me}}),function(t,e){"use strict";"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e():t.returnExports=e()}(this,function(){var t=Function.call,e=Object.prototype,r=t.bind(e.hasOwnProperty),n=t.bind(e.propertyIsEnumerable),o=t.bind(e.toString),i,a,c,u,l=r(e,"__defineGetter__");l&&(i=t.bind(e.__defineGetter__),a=t.bind(e.__defineSetter__),c=t.bind(e.__lookupGetter__),u=t.bind(e.__lookupSetter__));var f=function t(e){return null==e||"object"!=typeof e&&"function"!=typeof e};Object.getPrototypeOf||(Object.getPrototypeOf=function t(r){var n=r.__proto__;return n||null===n?n:"[object Function]"===o(r.constructor)?r.constructor.prototype:r instanceof Object?e:null});var s=function t(e){try{return e.sentinel=0,0===Object.getOwnPropertyDescriptor(e,"sentinel").value}catch(t){return!1}};if(Object.defineProperty){var p=s({});if(!("undefined"==typeof document||s(document.createElement("div")))||!p)var h=Object.getOwnPropertyDescriptor}if(!Object.getOwnPropertyDescriptor||h){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function t(o,i){if(f(o))throw new TypeError(y+o);if(h)try{return h.call(Object,o,i)}catch(t){}var a;if(!r(o,i))return a;if(a={enumerable:n(o,i),configurable:!0},l){var s=o.__proto__,p=o!==e;p&&(o.__proto__=e);var d=c(o,i),b=u(o,i);if(p&&(o.__proto__=s),d||b)return d&&(a.get=d),b&&(a.set=b),a}return a.value=o[i],a.writable=!0,a}}if(Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function t(e){return Object.keys(e)}),!Object.create){var d,b=!({__proto__:null}instanceof Object),v=function t(){if(!document.domain)return!1;try{return!!new ActiveXObject("htmlfile")}catch(t){return!1}},g=function t(){var e,r,n="script";return(r=new ActiveXObject("htmlfile")).write("<script><\/script>"),r.close(),e=r.parentWindow.Object.prototype,r=null,e},w=function t(){var e=document.createElement("iframe"),r=document.body||document.documentElement,n;return e.style.display="none",r.appendChild(e),e.src="javascript:",n=e.contentWindow.Object.prototype,r.removeChild(e),e=null,n};d=b||"undefined"==typeof document?function(){return{__proto__:null}}:function(){var t=v()?g():w();delete t.constructor,delete t.hasOwnProperty,delete t.propertyIsEnumerable,delete t.isPrototypeOf,delete t.toLocaleString,delete t.toString,delete t.valueOf;var e=function t(){};return e.prototype=t,d=function(){return new e},new e},Object.create=function t(e,r){var n,o=function t(){};if(null===e)n=d();else{if(null!==e&&f(e))throw new TypeError("Object prototype may only be an Object or null");o.prototype=e,(n=new o).__proto__=e}return void 0!==r&&Object.defineProperties(n,r),n}}var O=function t(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){return!1}};if(Object.defineProperty){var j=O({}),T="undefined"==typeof document||O(document.createElement("div"));if(!j||!T)var m=Object.defineProperty,D=Object.defineProperties}if(!Object.defineProperty||m){var E="Property description must be an object: ",x="Object.defineProperty called on non-object: ",S="getters & setters can not be defined on this javascript engine";Object.defineProperty=function t(r,n,o){if(f(r))throw new TypeError(x+r);if(f(o))throw new TypeError(E+o);if(m)try{return m.call(Object,r,n,o)}catch(t){}if("value"in o)if(l&&(c(r,n)||u(r,n))){var s=r.__proto__;r.__proto__=e,delete r[n],r[n]=o.value,r.__proto__=s}else r[n]=o.value;else{var p="get"in o,h="set"in o;if(!l&&(p||h))throw new TypeError(S);p&&i(r,n,o.get),h&&a(r,n,o.set)}return r}}Object.defineProperties&&!D||(Object.defineProperties=function t(e,r){if(D)try{return D.call(Object,e,r)}catch(t){}return Object.keys(r).forEach(function(t){"__proto__"!==t&&Object.defineProperty(e,t,r[t])}),e}),Object.seal||(Object.seal=function t(e){if(Object(e)!==e)throw new TypeError("Object.seal can only be called on Objects.");return e}),Object.freeze||(Object.freeze=function t(e){if(Object(e)!==e)throw new TypeError("Object.freeze can only be called on Objects.");return e});try{Object.freeze(function(){})}catch(t){Object.freeze=function(t){return function e(r){return"function"==typeof r?r:t(r)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function t(e){if(Object(e)!==e)throw new TypeError("Object.preventExtensions can only be called on Objects.");return e}),Object.isSealed||(Object.isSealed=function t(e){if(Object(e)!==e)throw new TypeError("Object.isSealed can only be called on Objects.");return!1}),Object.isFrozen||(Object.isFrozen=function t(e){if(Object(e)!==e)throw new TypeError("Object.isFrozen can only be called on Objects.");return!1}),Object.isExtensible||(Object.isExtensible=function t(e){if(Object(e)!==e)throw new TypeError("Object.isExtensible can only be called on Objects.");for(var n="";r(e,n);)n+="?";e[n]=!0;var o=r(e,n);return delete e[n],o})});
\ No newline at end of file
diff --git a/packages/es5-shim/minify.js b/packages/es5-shim/minify.js
deleted file mode 100644
index d34dd85e38..0000000000
--- a/packages/es5-shim/minify.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-// This script should be invoked before publishing the es5-shim package
-// using the following command:
-//
-//   meteor node minify.js
-//
-// Any changes to the es5-shim-sham.min.js file should then be committed.
-
-const {
-  readdirSync,
-  readFileSync,
-  writeFileSync,
-} = require("fs");
-
-const {
-  join: pathJoin
-} = require("path");
-
-const uglify =
-  require("../minifier-js/.npm/package/node_modules/uglify-es");
-
-const sourceFilePattern = /^es5-shim-sham\.js$/;
-
-readdirSync(__dirname).some(item => {
-  if (! sourceFilePattern.test(item)) {
-    return false;
-  }
-
-  const parts = item.split(".");
-  parts.push("min", parts.pop());
-  const absSourcePath = pathJoin(__dirname, item);
-  const absTargetPath = pathJoin(__dirname, parts.join("."));
-  const source = readFileSync(absSourcePath, "utf8");
-
-  // Compress with options similar to those used in
-  // packages/minifier-js/minifier.js.
-  const result = uglify.minify(source, {
-    compress: {
-      drop_debugger: false,
-      unused: false,
-      dead_code: true
-    }
-  });
-
-  console.log("Minifying " + item + " and saving to " + absTargetPath);
-
-  writeFileSync(absTargetPath, result.code);
-
-  return true;
-});
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 5bc03e0bc8..8c5ca46e35 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.7.3",
+  version: "4.8.0",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
@@ -11,15 +11,5 @@ Npm.depends({
 
 Package.onUse(function(api) {
   api.use("modules");
-  api.use("server-render");
-  api.use("shim-common");
-
-  api.addFiles("console.js", "client");
-  api.mainModule("cordova.js", "web.cordova");
-  api.mainModule("server.js", "server");
-
-  api.addAssets([
-    "es5-shim-sham.js",
-    "es5-shim-sham.min.js",
-  ], "client");
+  api.mainModule("client.js", "legacy");
 });
diff --git a/packages/es5-shim/server.js b/packages/es5-shim/server.js
deleted file mode 100644
index 45f3348d39..0000000000
--- a/packages/es5-shim/server.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const { onPageLoad } = require("meteor/server-render");
-const {
-  doNotNeedShim,
-  makeScript,
-} = require("meteor/shim-common");
-
-const minimumMajorVersions = {
-  chrome: 23,
-  firefox: 21,
-  ie: 10,
-  safari: 6,
-  phantomjs: 2,
-};
-
-onPageLoad(sink => {
-  if (doNotNeedShim(sink.request,
-                    minimumMajorVersions,
-                    "force_es5_shim")) {
-    return;
-  }
-  sink.appendToHead(
-    makeScript("es5-shim/es5-shim-sham")
-  );
-});
diff --git a/packages/facebook-oauth/facebook_client.js b/packages/facebook-oauth/facebook_client.js
index 175524b350..bf2c68a609 100644
--- a/packages/facebook-oauth/facebook_client.js
+++ b/packages/facebook-oauth/facebook_client.js
@@ -31,7 +31,7 @@ Facebook.requestCredential = (options, credentialRequestCompleteCallback) => {
   const loginStyle = OAuth._loginStyle('facebook', config, options);
 
   let loginUrl =
-      `https://www.facebook.com/v2.12/dialog/oauth?client_id=${config.appId}` +
+      `https://www.facebook.com/v3.0/dialog/oauth?client_id=${config.appId}` +
       `&redirect_uri=${OAuth._redirectUri('facebook', config)}` +
       `&display=${display}&scope=${scope}` +
       `&state=${OAuth._stateParam(loginStyle, credentialToken, options && options.redirectUrl)}`;
diff --git a/packages/facebook-oauth/facebook_server.js b/packages/facebook-oauth/facebook_server.js
index e65783b19b..c7dcbe42cc 100644
--- a/packages/facebook-oauth/facebook_server.js
+++ b/packages/facebook-oauth/facebook_server.js
@@ -2,10 +2,11 @@ Facebook = {};
 import crypto from 'crypto';
 
 Facebook.handleAuthFromAccessToken = (accessToken, expiresAt) => {
-  // include all fields from facebook
-  // http://developers.facebook.com/docs/reference/login/public-profile-and-friend-list/
-  const whitelisted = ['id', 'email', 'name', 'first_name',
-      'last_name', 'link', 'gender', 'locale', 'age_range'];
+  // include basic fields from facebook
+  // https://developers.facebook.com/docs/facebook-login/permissions/
+  const whitelisted = ['id', 'email', 'name', 'first_name', 'last_name',
+    'middle_name', 'name_format', 'picture', 'short_name', 'age_range',
+    'birthday', 'friends', 'gender', 'hometown', 'link', 'location'];
 
   const identity = getIdentity(accessToken, whitelisted);
 
@@ -53,7 +54,7 @@ const getTokenResponse = query => {
   try {
     // Request an access token
     responseContent = HTTP.get(
-      "https://graph.facebook.com/v2.12/oauth/access_token", {
+      "https://graph.facebook.com/v3.0/oauth/access_token", {
         params: {
           client_id: config.appId,
           redirect_uri: OAuth._redirectUri('facebook', config),
@@ -92,7 +93,7 @@ const getIdentity = (accessToken, fields) => {
   hmac.update(accessToken);
 
   try {
-    return HTTP.get("https://graph.facebook.com/v2.12/me", {
+    return HTTP.get("https://graph.facebook.com/v3.0/me", {
       params: {
         access_token: accessToken,
         appsecret_proof: hmac.digest('hex'),
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 95356c3cd6..8d1d5228e4 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.4.1",
+  version: "1.5.1"
 });
 
 Package.onUse(api => {
diff --git a/packages/http/httpcall_client.js b/packages/http/httpcall_client.js
index aa1d225602..a8aac475da 100644
--- a/packages/http/httpcall_client.js
+++ b/packages/http/httpcall_client.js
@@ -18,7 +18,7 @@ var hasOwn = Object.prototype.hasOwnProperty;
  * @param {Number} options.timeout Maximum time in milliseconds to wait for the request before failing.  There is no timeout by default.
  * @param {Boolean} options.followRedirects If `true`, transparently follow HTTP redirects. Cannot be set to `false` on the client. Default `true`.
  * @param {Object} options.npmRequestOptions On the server, `HTTP.call` is implemented by using the [npm `request` module](https://www.npmjs.com/package/request). Any options in this object will be passed directly to the `request` invocation.
- * @param {Function} options.beforeSend On the client, this will be called before the request is sent to allow for more direct manipulation of the underlying XMLHttpRequest object, which will be passed as the first argument. If the callback returns `false`, the request will be not be send.
+ * @param {Function} options.beforeSend On the client, this will be called before the request is sent to allow for more direct manipulation of the underlying XMLHttpRequest object, which will be passed as the first argument. If the callback returns `false`, the request will be not be sent.
  * @param {Function} [asyncCallback] Optional callback.  If passed, the method runs asynchronously, instead of synchronously, and calls asyncCallback.  On the client, this callback is required.
  */
 HTTP.call = function(method, url, options, callback) {
diff --git a/packages/http/httpcall_tests.js b/packages/http/httpcall_tests.js
index 7008d020f6..48cd523b5b 100644
--- a/packages/http/httpcall_tests.js
+++ b/packages/http/httpcall_tests.js
@@ -485,16 +485,22 @@ if (Meteor.isServer) {
       // the x-suppress-error header).
       WebApp.suppressConnectErrors();
 
-      var do_test = function (path, code, match) {
-        HTTP.get(
-          url_base() + path,
-          {headers: {'x-suppress-error': 'true'}},
-          expect(function(error, result) {
-            test.equal(result.statusCode, code);
-            if (match)
-              test.matches(result.content, match);
-          }));
-      };
+      function do_test(path, code, match) {
+        const prefix = Meteor.isModern
+          ? "" // No prefix for web.browser (modern).
+          : "/__browser.legacy";
+
+        HTTP.get(url_base() + prefix + path, {
+          headers: {
+            "x-suppress-error": "true"
+          }
+        }, expect(function(error, result) {
+          test.equal(result.statusCode, code);
+          if (match) {
+            test.matches(result.content, match);
+          }
+        }));
+      }
 
       // existing static file
       do_test("/packages/local-test_http/test_static.serveme", 200, /static file serving/);
diff --git a/packages/less/package.js b/packages/less/package.js
index 4246551c39..363b4c6926 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.12',
+  version: '2.8.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/less/plugin/compile-less.js b/packages/less/plugin/compile-less.js
index 4b428d2f51..ffd8bbb25a 100644
--- a/packages/less/plugin/compile-less.js
+++ b/packages/less/plugin/compile-less.js
@@ -1,6 +1,5 @@
 const path = Plugin.path;
 const less = Npm.require('less');
-const Future = Npm.require('fibers/future');
 
 Plugin.registerCompiler({
   // *.lessimport has been deprecated since 0.7.1, but it still works. We
@@ -45,49 +44,66 @@ class LessCompiler extends MultiFileCachingCompiler {
              /\.lessimport$/.test(pathInPackage));
   }
 
+  compileOneFileLater(inputFile, getResult) {
+    inputFile.addStylesheet({
+      path: inputFile.getPathInPackage(),
+    }, async () => {
+      const result = await getResult();
+      return result && {
+        data: result.css,
+        sourceMap: result.sourceMap,
+      };
+    });
+  }
+
   compileOneFile(inputFile, allFiles) {
     const importPlugin = new MeteorImportLessPlugin(allFiles);
 
-    const f = new Future;
-    let output;
-    try {
-      less.render(inputFile.getContentsAsBuffer().toString('utf8'), {
-        filename: this.getAbsoluteImportPath(inputFile),
-        plugins: [importPlugin],
-        // Generate a source map, and include the source files in the
-        // sourcesContent field.  (Note that source files which don't themselves
-        // produce text (eg, are entirely variable definitions) won't end up in
-        // the source map!)
-        sourceMap: { outputSourceFiles: true }
-      }, f.resolver());
-      output = f.wait();
-    } catch (e) {
+    return less.render(inputFile.getContentsAsBuffer().toString('utf8'), {
+      filename: this.getAbsoluteImportPath(inputFile),
+      plugins: [importPlugin],
+      // Generate a source map, and include the source files in the
+      // sourcesContent field. (Note that source files which don't
+      // themselves produce text (eg, are entirely variable definitions)
+      // won't end up in the source map!)
+      sourceMap: { outputSourceFiles: true }
+
+    }).then(output => {
+      if (output.map) {
+        const map = JSON.parse(output.map);
+        map.sources = map.sources.map(decodeFilePath);
+        output.map = map;
+      }
+
+      const compileResult = {
+        css: output.css,
+        sourceMap: output.map,
+      };
+
+      const referencedImportPaths = [];
+      output.imports.forEach((path) => {
+        // Some files that show up in output.imports are not actually files; for
+        // example @import url("...");
+        if (allFiles.has(path)) {
+          referencedImportPaths.push(path);
+        }
+      });
+
+      return {
+        compileResult,
+        referencedImportPaths,
+      };
+
+    }, e => {
       inputFile.error({
         message: e.message,
         sourcePath: decodeFilePath(e.filename),
         line: e.line,
         column: e.column
       });
+
       return null;
-    }
-
-    if (output.map) {
-      const map = JSON.parse(output.map);
-      map.sources = map.sources.map(decodeFilePath);
-      output.map = map;
-    }
-
-    const compileResult = {css: output.css, sourceMap: output.map};
-    const referencedImportPaths = [];
-    output.imports.forEach((path) => {
-      // Some files that show up in output.imports are not actually files; for
-      // example @import url("...");
-      if (allFiles.has(path)) {
-        referencedImportPaths.push(path);
-      }
     });
-
-    return {compileResult, referencedImportPaths};
   }
 
   addCompileResult(inputFile, compileResult) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index d3eb5d0e96..5cce8e2483 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.6.1_1'
+  version: '1.7.0_3'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/browser_environment_test.js b/packages/meteor/browser_environment_test.js
index cd31ec479d..23ca3592b1 100644
--- a/packages/meteor/browser_environment_test.js
+++ b/packages/meteor/browser_environment_test.js
@@ -2,4 +2,5 @@ Tinytest.add("environment - browser basics", function (test) {
   test.isTrue(Meteor.isClient);
   test.isFalse(Meteor.isServer);
   test.isFalse(Meteor.isCordova);
+  test.equal(typeof Meteor.isModern, "boolean");
 });
diff --git a/packages/meteor/client_environment.js b/packages/meteor/client_environment.js
index 57a5fd1c7a..7f8b035d1a 100644
--- a/packages/meteor/client_environment.js
+++ b/packages/meteor/client_environment.js
@@ -1,4 +1,5 @@
-meteorEnv = __meteor_runtime_config__.meteorEnv;
+var config = __meteor_runtime_config__;
+meteorEnv = config.meteorEnv;
 
 /**
  * @summary The Meteor namespace
@@ -36,15 +37,32 @@ Meteor = {
    * @type {Boolean}
    */
   isServer: false,
-  isCordova: false
+
+  /**
+   * @summary Boolean variable.  True if running in Cordova environment.
+   * @locus Anywhere
+   * @static
+   * @type {Boolean}
+   */
+  isCordova: false,
+
+  /**
+   * @summary Boolean variable. True if running in a "modern" JS
+   *          environment, as determined by the `modern` package.
+   * @locus Anywhere
+   * @static
+   * @type {Boolean}
+   */
+  isModern: config.isModern
 };
 
-if (typeof __meteor_runtime_config__ === 'object' &&
-    __meteor_runtime_config__.PUBLIC_SETTINGS) {
+if (config.PUBLIC_SETTINGS) {
   /**
    * @summary `Meteor.settings` contains deployment-specific configuration options. You can initialize settings by passing the `--settings` option (which takes the name of a file containing JSON data) to `meteor run` or `meteor deploy`. When running your server directly (e.g. from a bundle), you instead specify settings by putting the JSON directly into the `METEOR_SETTINGS` environment variable. If the settings object contains a key named `public`, then `Meteor.settings.public` will be available on the client as well as the server.  All other properties of `Meteor.settings` are only defined on the server.  You can rely on `Meteor.settings` and `Meteor.settings.public` being defined objects (not undefined) on both client and server even if there are no settings specified.  Changes to `Meteor.settings.public` at runtime will be picked up by new client connections.
    * @locus Anywhere
    * @type {Object}
    */
-  Meteor.settings = { 'public': __meteor_runtime_config__.PUBLIC_SETTINGS };
+  Meteor.settings = {
+    "public": config.PUBLIC_SETTINGS
+  };
 }
diff --git a/packages/meteor/cordova_environment.js b/packages/meteor/cordova_environment.js
index b0cc65a53a..dc83466243 100644
--- a/packages/meteor/cordova_environment.js
+++ b/packages/meteor/cordova_environment.js
@@ -8,3 +8,7 @@ Meteor.isCordova = true;
 
 Meteor.isProduction = meteorEnv.NODE_ENV === "production";
 Meteor.isDevelopment = meteorEnv.NODE_ENV !== "production";
+
+// For now, since we can't send different bundles to different Cordova
+// browsers at runtime, all Cordova clients must be regarded as legacy.
+Meteor.isModern = false;
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 89cbf764cb..bc1d727d3d 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.8.6'
+  version: '1.9.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/meteor/server_environment.js b/packages/meteor/server_environment.js
index 5832fce170..5d28d81039 100644
--- a/packages/meteor/server_environment.js
+++ b/packages/meteor/server_environment.js
@@ -12,7 +12,10 @@ Meteor = {
   isDevelopment: meteorEnv.NODE_ENV !== "production",
   isClient: false,
   isServer: true,
-  isCordova: false
+  isCordova: false,
+  // Server code runs in Node 8+, which is decidedly "modern" by any
+  // reasonable definition.
+  isModern: true
 };
 
 Meteor.settings = {};
diff --git a/packages/meteor/url_common.js b/packages/meteor/url_common.js
index f90453dfc0..3259499e14 100644
--- a/packages/meteor/url_common.js
+++ b/packages/meteor/url_common.js
@@ -23,11 +23,17 @@ Meteor.absoluteUrl = function (path, options) {
   if (!/^http[s]?:\/\//i.test(url)) // url starts with 'http://' or 'https://'
     url = 'http://' + url; // we will later fix to https if options.secure is set
 
-  if (!/\/$/.test(url)) // url ends with '/'
-    url += '/';
+  if (! url.endsWith("/")) {
+    url += "/";
+  }
 
-  if (path)
+  if (path) {
+    // join url and path with a / separator
+    while (path.startsWith("/")) {
+      path = path.slice(1);
+    }
     url += path;
+  }
 
   // turn http to https if secure option is set, and we're not talking
   // to localhost.
@@ -44,11 +50,27 @@ Meteor.absoluteUrl = function (path, options) {
 };
 
 // allow later packages to override default options
-Meteor.absoluteUrl.defaultOptions = { };
-if (typeof __meteor_runtime_config__ === "object" &&
-    __meteor_runtime_config__.ROOT_URL)
-  Meteor.absoluteUrl.defaultOptions.rootUrl = __meteor_runtime_config__.ROOT_URL;
+var defaultOptions = Meteor.absoluteUrl.defaultOptions = {};
 
+// available only in a browser environment
+var location = typeof window === "object" && window.location;
+
+if (typeof __meteor_runtime_config__ === "object" &&
+    __meteor_runtime_config__.ROOT_URL) {
+  defaultOptions.rootUrl = __meteor_runtime_config__.ROOT_URL;
+} else if (location &&
+           location.protocol &&
+           location.host) {
+  defaultOptions.rootUrl = location.protocol + "//" + location.host;
+}
+
+// Make absolute URLs use HTTPS by default if the current window.location
+// uses HTTPS. Since this is just a default, it can be overridden by
+// passing { secure: false } if necessary.
+if (location &&
+    location.protocol === "https:") {
+  defaultOptions.secure = true;
+}
 
 Meteor._relativeToSiteRootUrl = function (link) {
   if (typeof __meteor_runtime_config__ === "object" &&
diff --git a/packages/meteor/url_tests.js b/packages/meteor/url_tests.js
index ad686ceb16..365928e1e1 100644
--- a/packages/meteor/url_tests.js
+++ b/packages/meteor/url_tests.js
@@ -11,7 +11,7 @@ Tinytest.add("absolute-url - basics", function(test) {
     test.equal(Meteor.absoluteUrl('foo', {rootUrl: prefix + 'asdf.com/'}),
                'http://asdf.com/foo');
     test.equal(Meteor.absoluteUrl('/foo', {rootUrl: prefix + 'asdf.com'}),
-               'http://asdf.com//foo');
+               'http://asdf.com/foo');
     test.equal(Meteor.absoluteUrl('#foo', {rootUrl: prefix + 'asdf.com'}),
                'http://asdf.com/#foo');
 
diff --git a/packages/modern-browsers/README.md b/packages/modern-browsers/README.md
new file mode 100644
index 0000000000..069857cc04
--- /dev/null
+++ b/packages/modern-browsers/README.md
@@ -0,0 +1,7 @@
+# modern-browsers
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/modern-browsers) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/modern-browsers)
+***
+
+API for defining the boundary between modern and legacy JavaScript
+clients, with runtime support for choosing between the `web.browser`
+(modern) bundle architecture and `web.browser.legacy`.
diff --git a/packages/modern-browsers/TODO.md b/packages/modern-browsers/TODO.md
new file mode 100644
index 0000000000..cedea3209c
--- /dev/null
+++ b/packages/modern-browsers/TODO.md
@@ -0,0 +1,52 @@
+## Remaining work
+
+- [x] Come up with a system for constraining minimum browser versions.
+
+- [x] Research minimum versions for key ECMAScript features.
+
+- [x] Use the minimum versions in `webapp` to determine JS bundle.
+
+- [x] Import different `core-js` polyfills in `ecmascript-runtime-client`
+      depending on modern/legacy classification.
+
+- [x] Really vet the set of imported `core-js` polyfills based on known
+      minimum versions imposed by `setMinimumBrowserVersions`.
+
+- [x] Make sure the new url prefixes aren't too disruptive for public
+      assets like images.
+
+- [x] Make sure Cordova isn't automatically treated as a modern
+      environment.
+
+- [ ] Create an `isobuild:web-browser-legacy` pseudopackage.
+
+- [ ] Add tests to the `modules` test app.
+
+- [x] Expose `Meteor.isModern` on both client and server.
+
+- [ ] Make sure in-browser tests run with both `web.browser` and
+      `web.browser.legacy`.
+
+- [x] Use `web.browser.legacy` to handle `es5-shim` instead.
+
+- [x] Use `web.browser.legacy` to handle SockJS instead.
+
+- [x] Load `SockJS` using dynamic `import()` if necessary in modern
+      `web.browser` clients.
+
+- [x] Use different plugins in babel-compiler for `web.browser.legacy`.
+
+- [x] Fix dynamic module source map URLs (prepend `/__arch`).
+
+- [x] Fix tests failing because of changes to static resource URLs.
+
+- [ ] In development, save time by only rebuilding `web.browser` (modern)?
+
+- [ ] Try adding a `web.worker` platform and see if it works as expected.
+
+- [ ] Update `History.md` to reflect all these changes.
+
+- [ ] Write a blog post about the new modern/legacy system.
+
+- [ ] Update `compiler.BUILT_BY` and `LINKER_CACHE_SALT` to force
+      recompilation and relinking.
diff --git a/packages/modern-browsers/modern-tests.js b/packages/modern-browsers/modern-tests.js
new file mode 100644
index 0000000000..38711df3ca
--- /dev/null
+++ b/packages/modern-browsers/modern-tests.js
@@ -0,0 +1,32 @@
+import { Tinytest } from "meteor/tinytest";
+import { isModern } from "meteor/modern-browsers";
+
+Tinytest.add('modern-browsers - versions - basic', function (test) {
+  test.isTrue(isModern({
+    name: "chrome",
+    major: 60,
+  }));
+
+  test.isTrue(isModern({
+    name: "chromeMobile",
+    major: 60,
+  }));
+
+  test.isFalse(isModern({
+    name: "firefox",
+    major: 25,
+  }));
+
+  test.isTrue(isModern({
+    name: "safari",
+    major: 10,
+    minor: 2,
+  }));
+
+  test.isFalse(isModern({
+    name: "safari",
+    major: 9,
+    minor: 5,
+    patch: 2,
+  }));
+});
diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
new file mode 100644
index 0000000000..a051dbe096
--- /dev/null
+++ b/packages/modern-browsers/modern.js
@@ -0,0 +1,185 @@
+const minimumVersions = Object.create(null);
+const hasOwn = Object.prototype.hasOwnProperty;
+
+// By default, any minimum versions specified for chrome should apply to
+// chromeMobile too, per https://github.com/meteor/meteor/pull/9793,
+// though it should also be possible to specify minimum versions
+// specifically for chromeMobile. This map defines that aliasing behavior
+// in a generic way that could work for other browsers as well.
+const browserAliases = {
+  chrome: [
+    "chromeMobile",
+    "chromeMobileIOS",
+  ],
+
+  // If a call to setMinimumBrowserVersions specifies Edge 12 as a minimum
+  // version, that means no version of Internet Explorer pre-Edge should
+  // be classified as modern. This edge:["ie"] alias effectively enforces
+  // that logic, because there is no IE12. #9818 #9839
+  edge: ["ie"],
+
+  // The webapp package converts browser names to camel case, so
+  // mobile_safari and mobileSafari should be synonymous.
+  mobile_safari: ["mobileSafari"],
+};
+
+// Expand the given minimum versions by reusing chrome versions for
+// chromeMobile (according to browserAliases above).
+function applyAliases(versions) {
+  Object.keys(browserAliases).forEach(original => {
+    if (hasOwn.call(versions, original)) {
+      browserAliases[original].forEach(alias => {
+        if (! hasOwn.call(versions, alias)) {
+          versions[alias] = versions[original];
+        }
+      });
+    }
+  });
+
+  return versions;
+}
+
+// TODO Should it be possible for callers to setMinimumBrowserVersions to
+// forbid any version of a particular browser?
+
+// Given a { name, major, minor, patch } object like the one provided by
+// webapp via request.browser, return true if that browser qualifies as
+// "modern" according to all requested version constraints.
+function isModern(browser) {
+  return browser &&
+    typeof browser.name === "string" &&
+    hasOwn.call(minimumVersions, browser.name) &&
+    greaterThanOrEqualTo([
+      ~~browser.major,
+      ~~browser.minor,
+      ~~browser.patch,
+    ], minimumVersions[browser.name].version);
+}
+
+// Any package that depends on the modern-browsers package can call this
+// function to communicate its expectations for the minimum browser
+// versions that qualify as "modern." The final decision between
+// web.browser.legacy and web.browser will be based on the maximum of all
+// requested minimum versions for each browser.
+function setMinimumBrowserVersions(versions, source) {
+  applyAliases(versions);
+
+  Object.keys(versions).forEach(browserName => {
+    if (hasOwn.call(minimumVersions, browserName) &&
+        ! greaterThan(versions[browserName],
+                      minimumVersions[browserName].version)) {
+      return;
+    }
+
+    minimumVersions[browserName] = {
+      version: copy(versions[browserName]),
+      source: source || getCaller("setMinimumBrowserVersions")
+    };
+  });
+}
+
+function getCaller(calleeName) {
+  const error = new Error;
+  Error.captureStackTrace(error);
+  const lines = error.stack.split("\n");
+  let caller;
+  lines.some((line, i) => {
+    if (line.indexOf(calleeName) >= 0) {
+      caller = lines[i + 1].trim();
+      return true;
+    }
+  });
+  return caller;
+}
+
+Object.assign(exports, {
+  isModern,
+  setMinimumBrowserVersions,
+});
+
+// For making defensive copies of [major, minor, ...] version arrays, so
+// they don't change unexpectedly.
+function copy(version) {
+  if (typeof version === "number") {
+    return version;
+  }
+
+  if (Array.isArray(version)) {
+    return version.map(copy);
+  }
+
+  return version;
+}
+
+function greaterThanOrEqualTo(a, b) {
+  return ! greaterThan(b, a);
+}
+
+function greaterThan(a, b) {
+  const as = (typeof a === "number") ? [a] : a;
+  const bs = (typeof b === "number") ? [b] : b;
+  const maxLen = Math.max(as.length, bs.length);
+
+  for (let i = 0; i < maxLen; ++i) {
+    a = (i < as.length) ? as[i] : 0;
+    b = (i < bs.length) ? bs[i] : 0;
+
+    if (a > b) {
+      return true;
+    }
+
+    if (a < b) {
+      return false;
+    }
+  }
+
+  return false;
+}
+
+function makeSource(feature) {
+  return module.id + " (" + feature + ")"
+}
+
+setMinimumBrowserVersions({
+  chrome: 49,
+  edge: 12,
+  firefox: 45,
+  mobileSafari: [9, 2],
+  opera: 36,
+  safari: 9,
+  // Electron 1.0.0+ matches Chromium 49, per
+  // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
+  electron: 1,
+}, makeSource("classes"));
+
+setMinimumBrowserVersions({
+  chrome: 39,
+  edge: 13,
+  firefox: 26,
+  mobileSafari: 10,
+  opera: 26,
+  safari: 10,
+  // Disallow any version of PhantomJS.
+  phantomjs: Infinity,
+  electron: [0, 20],
+}, makeSource("generator functions"));
+
+setMinimumBrowserVersions({
+  chrome: 41,
+  edge: 13,
+  firefox: 34,
+  mobileSafari: [9, 2],
+  opera: 29,
+  safari: [9, 1],
+  electron: [0, 24],
+}, makeSource("template literals"));
+
+setMinimumBrowserVersions({
+  chrome: 38,
+  edge: 12,
+  firefox: 36,
+  mobileSafari: 9,
+  opera: 25,
+  safari: 9,
+  electron: [0, 20],
+}, makeSource("symbols"));
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
new file mode 100644
index 0000000000..4ea7eed7fc
--- /dev/null
+++ b/packages/modern-browsers/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  name: "modern-browsers",
+  version: "0.1.1",
+  summary: "API for defining the boundary between modern and legacy " +
+    "JavaScript clients",
+  documentation: "README.md"
+});
+
+Package.onUse(function(api) {
+  api.use("modules");
+  api.mainModule("modern.js", "server");
+});
+
+Package.onTest(function(api) {
+  api.use("ecmascript");
+  api.use("tinytest");
+  api.use("modern-browsers");
+  api.mainModule("modern-tests.js", "server");
+});
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 0453702e22..aac096c56a 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -7,9 +7,9 @@
       "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ=="
     },
     "reify": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.15.1.tgz",
-      "integrity": "sha512-XUIO34oFNXyb8cYRw3eVN0oqD3LwxaBFml5cHZf3Uiw6v+pfPB0D7kxKCdBjvaa1cneDtUqqQ94MPQkJt2kEWg=="
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.16.2.tgz",
+      "integrity": "sha512-9kL/IYcFiBbwpQFScNcFBJ5zhCEJTNujeDEEv5SoSg5er0V5CDbef2zNEk9FBeI9oehGOG5zM4APXgp5n3Llbw=="
     },
     "semver": {
       "version": "5.5.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 34c42aac4c..fd5f27a5d2 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,12 +1,12 @@
 Package.describe({
   name: "modules",
-  version: "0.11.6",
+  version: "0.12.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
 
 Npm.depends({
-  reify: "0.15.1"
+  reify: "0.16.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/modules/reify.js b/packages/modules/reify.js
index 6bbb48af8a..c635becdcb 100644
--- a/packages/modules/reify.js
+++ b/packages/modules/reify.js
@@ -1,5 +1,3 @@
-var Module = module.constructor;
-var Mp = Module.prototype;
-require("reify/lib/runtime").enable(Mp);
-Mp.importSync = Mp.importSync || Mp.import;
-Mp.import = Mp.import || Mp.importSync;
+require("reify/lib/runtime").enable(
+  module.constructor.prototype
+);
diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js
index efad05a493..c60574d556 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection.js
@@ -687,6 +687,8 @@ Object.assign(Mongo.Collection.prototype, {
   /**
    * @summary Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html) object corresponding to this collection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
    * @locus Server
+   * @memberof Mongo.Collection
+   * @instance
    */
   rawCollection() {
     var self = this;
@@ -699,6 +701,8 @@ Object.assign(Mongo.Collection.prototype, {
   /**
    * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
    * @locus Server
+   * @memberof Mongo.Collection
+   * @instance
    */
   rawDatabase() {
     var self = this;
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 73f96fee20..6819079d0d 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -170,11 +170,13 @@ MongoConnection = function (url, options) {
     url,
     mongoOptions,
     Meteor.bindEnvironment(
-      function (err, db) {
+      function (err, client) {
         if (err) {
           throw err;
         }
 
+        var db = client.db();
+
         // First, figure out what the current primary is, if any.
         if (db.serverConfig.isMasterDoc) {
           self._primary = db.serverConfig.isMasterDoc.primary;
@@ -201,14 +203,15 @@ MongoConnection = function (url, options) {
           }));
 
         // Allow the constructor to return.
-        connectFuture['return'](db);
+        connectFuture['return']({ client, db });
       },
       connectFuture.resolver()  // onException
     )
   );
 
-  // Wait for the connection to be successful; throws on failure.
-  self.db = connectFuture.wait();
+  // Wait for the connection to be successful (throws on failure) and assign the
+  // results (`client` and `db`) to `self`.
+  Object.assign(self, connectFuture.wait());
 
   if (options.oplogUrl && ! Package['disable-oplog']) {
     self._oplogHandle = new OplogHandle(options.oplogUrl, self.db.databaseName);
@@ -231,7 +234,7 @@ MongoConnection.prototype.close = function() {
   // Use Future.wrap so that errors get thrown. This happens to
   // work even outside a fiber since the 'close' method is not
   // actually asynchronous.
-  Future.wrap(_.bind(self.db.close, self.db))(true).wait();
+  Future.wrap(_.bind(self.client.close, self.client))(true).wait();
 };
 
 // Returns the Mongo Collection object; may yield.
@@ -947,7 +950,8 @@ MongoConnection.prototype._createSynchronousCursor = function(
   var mongoOptions = {
     sort: cursorOptions.sort,
     limit: cursorOptions.limit,
-    skip: cursorOptions.skip
+    skip: cursorOptions.skip,
+    projection: cursorOptions.fields
   };
 
   // Do we want a tailable cursor (which only works on capped collections)?
@@ -973,7 +977,7 @@ MongoConnection.prototype._createSynchronousCursor = function(
 
   var dbCursor = collection.find(
     replaceTypes(cursorDescription.selector, replaceMeteorAtomWithMongo),
-    cursorOptions.fields, mongoOptions);
+    mongoOptions);
 
   if (typeof cursorOptions.maxTimeMs !== 'undefined') {
     dbCursor = dbCursor.maxTimeMS(cursorOptions.maxTimeMs);
@@ -1001,21 +1005,33 @@ var SynchronousCursor = function (dbCursor, cursorDescription, options) {
     self._transform = null;
   }
 
-  // Need to specify that the callback is the first argument to nextObject,
-  // since otherwise when we try to call it with no args the driver will
-  // interpret "undefined" first arg as an options hash and crash.
-  self._synchronousNextObject = Future.wrap(
-    dbCursor.nextObject.bind(dbCursor), 0);
   self._synchronousCount = Future.wrap(dbCursor.count.bind(dbCursor));
   self._visitedIds = new LocalCollection._IdMap;
 };
 
 _.extend(SynchronousCursor.prototype, {
-  _nextObject: function () {
+  // Returns a Promise for the next object from the underlying cursor (before
+  // the Mongo->Meteor type replacement).
+  _rawNextObjectPromise: function () {
+    const self = this;
+    return new Promise((resolve, reject) => {
+      self._dbCursor.next((err, doc) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(doc);
+        }
+      });
+    });
+  },
+
+  // Returns a Promise for the next object from the cursor, skipping those whose
+  // IDs we've already seen and replacing Mongo atoms with Meteor atoms.
+  _nextObjectPromise: async function () {
     var self = this;
 
     while (true) {
-      var doc = self._synchronousNextObject().wait();
+      var doc = await self._rawNextObjectPromise();
 
       if (!doc) return null;
       doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
@@ -1038,6 +1054,35 @@ _.extend(SynchronousCursor.prototype, {
     }
   },
 
+  // Returns a promise which is resolved with the next object (like with
+  // _nextObjectPromise) or rejected if the cursor doesn't return within
+  // timeoutMS ms.
+  _nextObjectPromiseWithTimeout: function (timeoutMS) {
+    const self = this;
+    if (!timeoutMS) {
+      return self._nextObjectPromise();
+    }
+    const nextObjectPromise = self._nextObjectPromise();
+    const timeoutErr = new Error('Client-side timeout waiting for next object');
+    const timeoutPromise = new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        reject(timeoutErr);
+      }, timeoutMS);
+    });
+    return Promise.race([nextObjectPromise, timeoutPromise])
+      .catch((err) => {
+        if (err === timeoutErr) {
+          self.close();
+        }
+        throw err;
+      });
+  },
+
+  _nextObject: function () {
+    var self = this;
+    return self._nextObjectPromise().await();
+  },
+
   forEach: function (callback, thisArg) {
     var self = this;
 
@@ -1124,7 +1169,13 @@ SynchronousCursor.prototype[Symbol.iterator] = function () {
   };
 };
 
-MongoConnection.prototype.tail = function (cursorDescription, docCallback) {
+// Tails the cursor described by cursorDescription, most likely on the
+// oplog. Calls docCallback with each document found. Ignores errors and just
+// restarts the tail on error.
+//
+// If timeoutMS is set, then if we don't get a new document every timeoutMS,
+// kill and restart the cursor. This is primarily a workaround for #8598.
+MongoConnection.prototype.tail = function (cursorDescription, docCallback, timeoutMS) {
   var self = this;
   if (!cursorDescription.options.tailable)
     throw new Error("Can only tail a tailable cursor");
@@ -1139,14 +1190,15 @@ MongoConnection.prototype.tail = function (cursorDescription, docCallback) {
       if (stopped)
         return;
       try {
-        doc = cursor._nextObject();
+        doc = cursor._nextObjectPromiseWithTimeout(timeoutMS).await();
       } catch (err) {
-        // There's no good way to figure out if this was actually an error
-        // from Mongo. Ah well. But either way, we need to retry the cursor
-        // (unless the failure was because the observe got stopped).
+        // There's no good way to figure out if this was actually an error from
+        // Mongo, or just client-side (including our own timeout error). Ah
+        // well. But either way, we need to retry the cursor (unless the failure
+        // was because the observe got stopped).
         doc = null;
       }
-      // Since cursor._nextObject can yield, we need to check again to see if
+      // Since we awaited a promise above, we need to check again to see if
       // we've been stopped before calling the callback.
       if (stopped)
         return;
diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
index d012722b79..949521e03b 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/mongo_livedata_tests.js
@@ -3234,7 +3234,7 @@ Meteor.isServer && Tinytest.add(
 
 Meteor.isServer && Tinytest.add("mongo-livedata - npm modules", function (test) {
   // Make sure the version number looks like a version number.
-  test.matches(MongoInternals.NpmModules.mongodb.version, /^2\.(\d+)\.(\d+)/);
+  test.matches(MongoInternals.NpmModules.mongodb.version, /^3\.(\d+)\.(\d+)/);
   test.equal(typeof(MongoInternals.NpmModules.mongodb.module), 'function');
   test.equal(typeof(MongoInternals.NpmModules.mongodb.module.connect),
              'function');
diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js
index eb7f59d74b..5114ed890e 100644
--- a/packages/mongo/oplog_tailing.js
+++ b/packages/mongo/oplog_tailing.js
@@ -3,6 +3,7 @@ var Future = Npm.require('fibers/future');
 OPLOG_COLLECTION = 'oplog.rs';
 
 var TOO_FAR_BEHIND = process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000;
+var TAIL_TIMEOUT = +process.env.METEOR_OPLOG_TAIL_TIMEOUT || 30000;
 
 var showTS = function (ts) {
   return "Timestamp(" + ts.getHighBits() + ", " + ts.getLowBits() + ")";
@@ -96,8 +97,7 @@ _.extend(OplogHandle.prototype, {
 
     var originalCallback = callback;
     callback = Meteor.bindEnvironment(function (notification) {
-      // XXX can we avoid this clone by making oplog.js careful?
-      originalCallback(EJSON.clone(notification));
+      originalCallback(notification);
     }, function (err) {
       Meteor._debug("Error in oplog callback", err);
     });
@@ -236,11 +236,19 @@ _.extend(OplogHandle.prototype, {
     var cursorDescription = new CursorDescription(
       OPLOG_COLLECTION, oplogSelector, {tailable: true});
 
+    // Start tailing the oplog.
+    //
+    // We restart the low-level oplog query every 30 seconds if we didn't get a
+    // doc. This is a workaround for #8598: the Node Mongo driver has at least
+    // one bug that can lead to query callbacks never getting called (even with
+    // an error) when leadership failover occur.
     self._tailHandle = self._oplogTailConnection.tail(
-      cursorDescription, function (doc) {
+      cursorDescription,
+      function (doc) {
         self._entryQueue.push(doc);
         self._maybeStartWorker();
-      }
+      },
+      TAIL_TIMEOUT
     );
     self._readyFuture.return();
   },
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 29e67b78ac..bac51f72d1 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.4.7'
+  version: '1.5.0'
 });
 
 Npm.depends({
diff --git a/packages/non-core/bundle-visualizer/client.js b/packages/non-core/bundle-visualizer/client.js
index eb5ef8acb3..71925a55a6 100644
--- a/packages/non-core/bundle-visualizer/client.js
+++ b/packages/non-core/bundle-visualizer/client.js
@@ -7,7 +7,7 @@ import {
 } from "./common.js";
 import * as classes from "./classNames.js";
 
-import "./style.css";
+import("./style.css");
 
 Meteor.startup(() => {
   import("./sunburst.js").then(s => main(s.Sunburst));
diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js
index 45f6fe2b0e..4e7f1aa764 100644
--- a/packages/non-core/bundle-visualizer/package.js
+++ b/packages/non-core/bundle-visualizer/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.3',
+  version: '1.2.0',
   summary: 'Meteor bundle analysis and visualization.',
   documentation: 'README.md',
 });
diff --git a/packages/non-core/bundle-visualizer/server.js b/packages/non-core/bundle-visualizer/server.js
index adcf1b4382..839ec893ea 100644
--- a/packages/non-core/bundle-visualizer/server.js
+++ b/packages/non-core/bundle-visualizer/server.js
@@ -33,21 +33,38 @@ function getStatBundles() {
     f.absolutePath.endsWith(".stats.json");
 
   // Read the stat file, but if it's in any way unusable just return null.
-  const readOrNull = file => {
+  function readOrNull(file) {
     try {
       return JSON.parse(fsReadFileSync(file, "utf8"));
     } catch (err) {
       return null;
     }
-  };
+  }
 
-  return Object.keys(WebAppInternals.staticFiles)
-    .map(staticFile => WebAppInternals.staticFiles[staticFile])
-    .filter(statFileFilter)
-    .map(statFile => ({
-      name: statFile.hash,
-      stats: readOrNull(statFile.absolutePath),
-    }));
+  const {
+    staticFiles,
+    staticFilesByArch,
+  } = WebAppInternals;
+
+  const files = [];
+
+  if (staticFilesByArch) {
+    Object.keys(staticFilesByArch).forEach(arch => {
+      const staticFiles = staticFilesByArch[arch];
+      Object.keys(staticFiles).forEach(path => {
+        files.push(staticFiles[path]);
+      });
+    });
+  } else if (staticFiles) {
+    Object.keys(staticFiles).forEach(path => {
+      files.push(staticFiles[path]);
+    });
+  }
+
+  return files.filter(statFileFilter).map(file => ({
+    name: file.hash,
+    stats: readOrNull(file.absolutePath),
+  }));
 }
 
 function _childModules(node) {
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index d6e057fd05..19580933d2 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -2,54 +2,19 @@
   "lockfileVersion": 1,
   "dependencies": {
     "bson": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz",
-      "integrity": "sha1-k8ENOeqltYQVy8QFLz5T5WKwtyw="
-    },
-    "buffer-shims": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "es6-promise": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
-      "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.6.tgz",
+      "integrity": "sha512-D8zmlb46xfuK2gGvKmUjIklQEouN2nQ0LEHHeZ/NoHM2LDiMk2EYzZ5Ntw/Urk+bgMDosOZxaRzXxvhI5TcAVQ=="
     },
     "mongodb": {
-      "version": "2.2.34",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz",
-      "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.7.tgz",
+      "integrity": "sha512-n/14kMJEoARXz1qhpNPhUocqy+z5130jhqgEIX1Tsl8UVpHrndQ8et+VmgC4yPK/I8Tcgc93JEMQCHTekBUnNA=="
     },
     "mongodb-core": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz",
-      "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA="
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-    },
-    "readable-stream": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
-      "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.7.tgz",
+      "integrity": "sha512-z6YufO7s40wLiv2ssFshqoLS4+Kf+huhHq6KZ7gDArsKNzXYjAwTMnhEIJ9GQ8fIfBGs5tBLNPfbIDoCKGPmOw=="
     },
     "require_optional": {
       "version": "1.0.1",
@@ -61,25 +26,10 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
       "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
     },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
     "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     }
   }
 }
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index ee92ce7445..871f32bc41 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "2.2.34",
+  version: "3.0.7",
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.34"
+  mongodb: "3.0.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/client.js b/packages/promise/client.js
index 3ae9d3b539..45bb028335 100644
--- a/packages/promise/client.js
+++ b/packages/promise/client.js
@@ -1,3 +1,2 @@
-require("meteor-promise").makeCompatible(
-  exports.Promise = require("./common.js").Promise
-);
+require("./extensions.js");
+require("meteor-promise").makeCompatible(Promise);
diff --git a/packages/promise/common.js b/packages/promise/extensions.js
similarity index 83%
rename from packages/promise/common.js
rename to packages/promise/extensions.js
index cc1dc05157..1deb9aac64 100644
--- a/packages/promise/common.js
+++ b/packages/promise/extensions.js
@@ -1,15 +1,6 @@
-var global = this;
+var proto = Promise.prototype;
 var hasOwn = Object.prototype.hasOwnProperty;
 
-if (typeof global.Promise === "function") {
-  exports.Promise = global.Promise;
-} else {
-  exports.Promise = global.Promise =
-    require("promise/lib/es6-extensions");
-}
-
-var proto = exports.Promise.prototype;
-
 proto.done = function (onFulfilled, onRejected) {
   var self = this;
 
diff --git a/packages/promise/legacy.js b/packages/promise/legacy.js
new file mode 100644
index 0000000000..038e6b3c73
--- /dev/null
+++ b/packages/promise/legacy.js
@@ -0,0 +1,8 @@
+// In legacy environments, load a polyfill if global.Promise was not
+// defined in modern.js.
+if (typeof global.Promise === "function") {
+  Promise = global.Promise;
+} else {
+  Promise = global.Promise =
+    require("promise/lib/es6-extensions");
+}
diff --git a/packages/promise/modern.js b/packages/promise/modern.js
new file mode 100644
index 0000000000..6f7dee6b54
--- /dev/null
+++ b/packages/promise/modern.js
@@ -0,0 +1,3 @@
+// Initialize the package-scoped Promise variable with global.Promise in
+// all environments, even if it's not defined.
+Promise = global.Promise;
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 05d2f38913..b7c2cac64c 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.10.2",
+  version: "0.11.1",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
@@ -13,6 +13,9 @@ Npm.depends({
 
 Package.onUse(function(api) {
   api.use("modules");
+  api.use("modern-browsers");
+  api.addFiles("modern.js");
+  api.addFiles("legacy.js", "legacy");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
   api.export("Promise");
diff --git a/packages/promise/server.js b/packages/promise/server.js
index b28fdfa1b4..0e81c6e8d4 100644
--- a/packages/promise/server.js
+++ b/packages/promise/server.js
@@ -1,6 +1,23 @@
+require("./extensions.js");
+
 require("meteor-promise").makeCompatible(
-  exports.Promise = require("./common.js").Promise,
+  Promise,
   // Allow every Promise callback to run in a Fiber drawn from a pool of
   // reusable Fibers.
   require("fibers")
 );
+
+// Reference: https://caniuse.com/#feat=promises
+require("meteor/modern-browsers").setMinimumBrowserVersions({
+  chrome: 32,
+  edge: 12,
+  // Since there is no IE11, this effectively excludes Internet Explorer
+  // (pre-Edge) from the modern classification. #9818 #9839
+  ie: 12,
+  firefox: 29,
+  mobileSafari: 8,
+  opera: 20,
+  safari: [7, 1],
+  // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
+  electron: [0, 20],
+}, module.id);
diff --git a/packages/server-render/package.js b/packages/server-render/package.js
index b19a25ac15..432afae1b2 100644
--- a/packages/server-render/package.js
+++ b/packages/server-render/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "server-render",
-  version: "0.3.0",
+  version: "0.3.1",
   summary: "Generic support for server-side rendering in Meteor apps",
   documentation: "README.md"
 });
@@ -15,7 +15,7 @@ Npm.depends({
 Package.onUse(function(api) {
   api.use("ecmascript");
   api.use("webapp");
-  api.mainModule("client.js", "client");
+  api.mainModule("client.js", "client", { lazy: true });
   api.mainModule("server.js", "server");
 });
 
diff --git a/packages/shim-common/README.md b/packages/shim-common/README.md
deleted file mode 100644
index 18267f0898..0000000000
--- a/packages/shim-common/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# shim-common
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/shim-common) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/shim-common)
-***
-
-Shared utilities for packages like
-[`sockjs-shim`](https://github.com/meteor/meteor/tree/devel/packages/sockjs-shim)
-and
-[`es5-shim`](https://github.com/meteor/meteor/tree/devel/packages/es5-shim).
diff --git a/packages/shim-common/package.js b/packages/shim-common/package.js
deleted file mode 100644
index 5897d2d477..0000000000
--- a/packages/shim-common/package.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Package.describe({
-  name: "shim-common",
-  version: "0.1.0",
-  summary: "Shared utilities for packages like sockjs-shim and es5-shim",
-  documentation: "README.md"
-});
-
-Package.onUse(function(api) {
-  api.use("ecmascript");
-  api.mainModule("server.js", "server");
-});
diff --git a/packages/shim-common/server.js b/packages/shim-common/server.js
deleted file mode 100644
index 7e6a4738d6..0000000000
--- a/packages/shim-common/server.js
+++ /dev/null
@@ -1,38 +0,0 @@
-"use strict";
-
-export const hasOwn = Object.prototype.hasOwnProperty;
-
-export function doNotNeedShim(
-  // The HTTP request object, as exposed (for example) by sink.request.
-  request,
-  // Map from lowercase browser names to the minimum major version of that
-  // browser that no longer needs the shim.
-  minimumMajorVersions = {},
-  // Optional URL query parameter that can be used to force the shim to be
-  // injected into the HTTP response.
-  queryForceParam,
-) {
-  const { browser, url } = request;
-
-  if (queryForceParam) {
-    const query = url && url.query;
-    const forced = query && query[queryForceParam];
-    if (forced) {
-      return false;
-    }
-  }
-
-  if (browser &&
-      hasOwn.call(minimumMajorVersions, browser.name) &&
-      browser.major >= minimumMajorVersions[browser.name]) {
-    return true;
-  }
-
-  return false;
-}
-
-export function makeScript(packagePath) {
-  return '\n<script src="/packages/' + packagePath + (
-    Meteor.isProduction ? ".min.js" : ".js"
-  ) + '"></script>';
-}
diff --git a/packages/socket-stream-client/browser.js b/packages/socket-stream-client/browser.js
index 237a928804..db75e4ddec 100644
--- a/packages/socket-stream-client/browser.js
+++ b/packages/socket-stream-client/browser.js
@@ -2,9 +2,14 @@ import {
   toSockjsUrl,
   toWebsocketUrl,
 } from "./urls.js";
-import "./sockjs-0.3.4.js";
+
 import { StreamClientCommon } from "./common.js";
 
+// Statically importing SockJS here will prevent native WebSocket usage
+// below (in favor of SockJS), but will ensure maximum compatibility for
+// clients stuck in unusual networking environments.
+import "./sockjs-0.3.4.js";
+
 export class ClientStream extends StreamClientCommon {
   // @param url {String} URL to Meteor app
   //   "http://subdomain.meteor.com/" or "/" or
@@ -184,11 +189,16 @@ export class ClientStream extends StreamClientCommon {
     };
 
     this.socket.onclose = () => {
-      if (this.lastError) {
-        this._lostConnection(this.lastError);
-      } else {
+      Promise.resolve(
+        // If the socket is closing because there was an error, and we
+        // didn't load SockJS before, try loading it dynamically before
+        // retrying the connection.
+        this.lastError &&
+        ! hasSockJS &&
+        import("./sockjs-0.3.4.js")
+      ).done(() => {
         this._lostConnection();
-      }
+      });
     };
 
     this.socket.onerror = error => {
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 543a7950a0..dd9e4a73b4 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: "0.1.0",
+  version: "0.2.2",
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
@@ -12,8 +12,14 @@ Npm.depends({
 
 Package.onUse(function(api) {
   api.use("ecmascript");
+  api.use("modern-browsers");
   api.use("retry"); // TODO Try to remove this.
+  api.use("dynamic-import");
+
+  api.addFiles("sockjs-0.3.4.js", "legacy");
   api.mainModule("browser.js", "client", { lazy: true });
+
+  api.addFiles("server.js", "server");
   api.mainModule("node.js", "server", { lazy: true });
 });
 
diff --git a/packages/socket-stream-client/server.js b/packages/socket-stream-client/server.js
new file mode 100644
index 0000000000..aa28e7d750
--- /dev/null
+++ b/packages/socket-stream-client/server.js
@@ -0,0 +1,14 @@
+import {
+  setMinimumBrowserVersions,
+} from "meteor/modern-browsers";
+
+setMinimumBrowserVersions({
+  chrome: 16,
+  edge: 12,
+  firefox: 11,
+  ie: 10,
+  mobileSafari: [6, 1],
+  phantomjs: 2,
+  safari: 7,
+  electron: [0, 20],
+}, module.id);
diff --git a/packages/webapp/legacy_test_asset.js b/packages/webapp/legacy_test_asset.js
new file mode 100644
index 0000000000..e889f09131
--- /dev/null
+++ b/packages/webapp/legacy_test_asset.js
@@ -0,0 +1 @@
+console.log("LEGACY");
diff --git a/packages/webapp/modern_test_asset.js b/packages/webapp/modern_test_asset.js
new file mode 100644
index 0000000000..c30017283a
--- /dev/null
+++ b/packages/webapp/modern_test_asset.js
@@ -0,0 +1 @@
+console.log("MODERN");
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 381e71ec8a..c65234f9e7 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.5.0'
+  version: '1.6.1'
 });
 
 Npm.depends({"basic-auth-connect": "1.0.0",
@@ -27,8 +27,14 @@ Cordova.depends({
 
 Package.onUse(function (api) {
   api.use('ecmascript');
-  api.use(['logging', 'underscore', 'routepolicy', 'boilerplate-generator',
-           'webapp-hashing'], 'server');
+  api.use([
+    'logging',
+    'underscore',
+    'routepolicy',
+    'modern-browsers',
+    'boilerplate-generator',
+    'webapp-hashing'
+  ], 'server');
 
   // At response serving time, webapp uses browser-policy if it is loaded. If
   // browser-policy is loaded, then it must be loaded after webapp
@@ -51,4 +57,7 @@ Package.onTest(function (api) {
   api.addFiles('webapp_tests.js', 'server');
   api.addFiles('webapp_client_tests.js', 'client');
   api.addFiles('socket_file_tests.js', 'server');
+
+  api.addAssets('modern_test_asset.js', 'web.browser');
+  api.addAssets('legacy_test_asset.js', 'legacy');
 });
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 7a1d3b3d5f..870b31c96b 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -14,6 +14,7 @@ import query from "qs-middleware";
 import parseRequest from "parseurl";
 import basicAuth from "basic-auth-connect";
 import { lookup as lookupUserAgent } from "useragent";
+import { isModern } from "meteor/modern-browsers";
 import send from "send";
 import {
   removeExistingSocketFile,
@@ -26,6 +27,8 @@ var LONG_SOCKET_TIMEOUT = 120*1000;
 export const WebApp = {};
 export const WebAppInternals = {};
 
+const hasOwn = Object.prototype.hasOwnProperty;
+
 // backwards compat to 2.0 of connect
 connect.basicAuth = basicAuth;
 
@@ -36,7 +39,9 @@ WebAppInternals.NpmModules = {
   }
 };
 
-WebApp.defaultArch = 'web.browser';
+// Though we might prefer to use web.browser (modern) as the default
+// architecture, safety requires a more compatible defaultArch.
+WebApp.defaultArch = 'web.browser.legacy';
 
 // XXX maps archs to manifests
 WebApp.clientPrograms = {};
@@ -321,38 +326,39 @@ WebAppInternals.generateBoilerplateInstance = function (arch,
     _.clone(__meteor_runtime_config__),
     additionalOptions.runtimeConfigOverrides || {}
   );
-  return new Boilerplate(arch, manifest,
-    _.extend({
-      pathMapper: function (itemPath) {
-        return pathJoin(archPath[arch], itemPath); },
-      baseDataExtension: {
-        additionalStaticJs: _.map(
-          additionalStaticJs || [],
-          function (contents, pathname) {
-            return {
-              pathname: pathname,
-              contents: contents
-            };
-          }
-        ),
-        // Convert to a JSON string, then get rid of most weird characters, then
-        // wrap in double quotes. (The outermost JSON.stringify really ought to
-        // just be "wrap in double quotes" but we use it to be safe.) This might
-        // end up inside a <script> tag so we need to be careful to not include
-        // "</script>", but normal {{spacebars}} escaping escapes too much! See
-        // https://github.com/meteor/meteor/issues/3730
-        meteorRuntimeConfig: JSON.stringify(
-          encodeURIComponent(JSON.stringify(runtimeConfig))),
-        rootUrlPathPrefix: __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '',
-        bundledJsCssUrlRewriteHook: bundledJsCssUrlRewriteHook,
-        inlineScriptsAllowed: WebAppInternals.inlineScriptsAllowed(),
-        inline: additionalOptions.inline
-      }
-    }, additionalOptions)
-  );
+
+  return new Boilerplate(arch, manifest, _.extend({
+    pathMapper(itemPath) {
+      return pathJoin(archPath[arch], itemPath);
+    },
+    baseDataExtension: {
+      additionalStaticJs: _.map(
+        additionalStaticJs || [],
+        function (contents, pathname) {
+          return {
+            pathname: pathname,
+            contents: contents
+          };
+        }
+      ),
+      // Convert to a JSON string, then get rid of most weird characters, then
+      // wrap in double quotes. (The outermost JSON.stringify really ought to
+      // just be "wrap in double quotes" but we use it to be safe.) This might
+      // end up inside a <script> tag so we need to be careful to not include
+      // "</script>", but normal {{spacebars}} escaping escapes too much! See
+      // https://github.com/meteor/meteor/issues/3730
+      meteorRuntimeConfig: JSON.stringify(
+        encodeURIComponent(JSON.stringify(runtimeConfig))),
+      rootUrlPathPrefix: __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '',
+      bundledJsCssUrlRewriteHook: bundledJsCssUrlRewriteHook,
+      inlineScriptsAllowed: WebAppInternals.inlineScriptsAllowed(),
+      inline: additionalOptions.inline
+    }
+  }, additionalOptions));
 };
 
-// A mapping from url path to "info". Where "info" has the following fields:
+// A mapping from url path to architecture (e.g. "web.browser") to static
+// file information with the following fields:
 // - type: the type of file to be served
 // - cacheable: optionally, whether the file should be cached or not
 // - sourceMapUrl: optionally, the url of the source map
@@ -361,11 +367,11 @@ WebAppInternals.generateBoilerplateInstance = function (arch,
 // - content: the stringified content that should be served at this path
 // - absolutePath: the absolute path on disk to the file
 
-var staticFiles;
+var staticFilesByArch;
 
 // Serve static files from the manifest or added with
 // `addStaticJs`. Exported for tests.
-WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
+WebAppInternals.staticFilesMiddleware = function (staticFilesByArch, req, res, next) {
   if ('GET' != req.method && 'HEAD' != req.method && 'OPTIONS' != req.method) {
     next();
     return;
@@ -397,7 +403,12 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
     return;
   }
 
-  if (!_.has(staticFiles, pathname)) {
+  const info = getStaticFileInfo(
+    pathname,
+    identifyBrowser(req.headers["user-agent"]),
+  );
+
+  if (! info) {
     next();
     return;
   }
@@ -406,14 +417,20 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
   // 'send' and yield to the event loop, we never call another handler with
   // 'next'.
 
-  var info = staticFiles[pathname];
-
   // Cacheable files are files that should never change. Typically
   // named by their hash (eg meteor bundled js and css files).
   // We cache them ~forever (1yr).
-  var maxAge = info.cacheable
-        ? 1000 * 60 * 60 * 24 * 365
-        : 0;
+  const maxAge = info.cacheable
+    ? 1000 * 60 * 60 * 24 * 365
+    : 0;
+
+  if (info.cacheable) {
+    // Since we use req.headers["user-agent"] to determine whether the
+    // client should receive modern or legacy resources, tell the client
+    // to invalidate cached resources when/if its user agent string
+    // changes in the future.
+    res.setHeader("Vary", "User-Agent");
+  }
 
   // Set the X-SourceMap header, which current Chrome, FireFox, and Safari
   // understand.  (The SourceMap header is slightly more spec-correct but FF
@@ -445,32 +462,87 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
     res.end();
   } else {
     send(req, info.absolutePath, {
-        maxage: maxAge,
-        dotfiles: 'allow', // if we specified a dotfile in the manifest, serve it
-        lastModified: false // don't set last-modified based on the file date
-      }).on('error', function (err) {
-        Log.error("Error serving static file " + err);
-        res.writeHead(500);
-        res.end();
-      })
-      .on('directory', function () {
-        Log.error("Unexpected directory " + info.absolutePath);
-        res.writeHead(500);
-        res.end();
-      })
-      .pipe(res);
+      maxage: maxAge,
+      dotfiles: 'allow', // if we specified a dotfile in the manifest, serve it
+      lastModified: false // don't set last-modified based on the file date
+    }).on('error', function (err) {
+      Log.error("Error serving static file " + err);
+      res.writeHead(500);
+      res.end();
+    }).on('directory', function () {
+      Log.error("Unexpected directory " + info.absolutePath);
+      res.writeHead(500);
+      res.end();
+    }).pipe(res);
   }
 };
 
-var getUrlPrefixForArch = function (arch) {
-  // XXX we rely on the fact that arch names don't contain slashes
-  // in that case we would need to uri escape it
+function getStaticFileInfo(originalPath, browser) {
+  const { arch, path } = getArchAndPath(originalPath, browser);
 
-  // We add '__' to the beginning of non-standard archs to "scope" the url
-  // to Meteor internals.
-  return arch === WebApp.defaultArch ?
-    '' : '/' + '__' + arch.replace(/^web\./, '');
-};
+  if (! hasOwn.call(WebApp.clientPrograms, arch)) {
+    return null;
+  }
+
+  // Get a list of all available static file architectures, with arch
+  // first in the list if it exists.
+  const staticArchList = Object.keys(staticFilesByArch);
+  const archIndex = staticArchList.indexOf(arch);
+  if (archIndex > 0) {
+    staticArchList.unshift(staticArchList.splice(archIndex, 1)[0]);
+  }
+
+  let info = null;
+
+  staticArchList.some(arch => {
+    const staticFiles = staticFilesByArch[arch];
+
+    // If staticFiles contains originalPath with the arch inferred above,
+    // use that information.
+    if (hasOwn.call(staticFiles, originalPath)) {
+      return info = staticFiles[originalPath];
+    }
+
+    // If getArchAndPath returned an alternate path, try that instead.
+    if (path !== originalPath &&
+        hasOwn.call(staticFiles, path)) {
+      return info = staticFiles[path];
+    }
+  });
+
+  return info;
+}
+
+function getArchAndPath(path, browser) {
+  const pathParts = path.split("/");
+  const archKey = pathParts[1];
+
+  if (archKey.startsWith("__")) {
+    const archCleaned = "web." + archKey.slice(2);
+    if (hasOwn.call(WebApp.clientPrograms, archCleaned)) {
+      pathParts.splice(1, 1); // Remove the archKey part.
+      return {
+        arch: archCleaned,
+        path: pathParts.join("/"),
+      };
+    }
+  }
+
+  // TODO Perhaps one day we could infer Cordova clients here, so that we
+  // wouldn't have to use prefixed "/__cordova/..." URLs.
+  const arch = isModern(browser)
+    ? "web.browser"
+    : "web.browser.legacy";
+
+  if (hasOwn.call(WebApp.clientPrograms, arch)) {
+    return { arch, path };
+  }
+
+  return {
+    arch: WebApp.defaultArch,
+    path,
+  };
+}
 
 // Parse the passed in port value. Return the port as-is if it's a String
 // (e.g. a Windows Server style named pipe), otherwise return the port as an
@@ -496,8 +568,16 @@ function runWebAppServer() {
 
   WebAppInternals.reloadClientPrograms = function () {
     syncQueue.runTask(function() {
-      staticFiles = {};
-      var generateClientProgram = function (clientPath, arch) {
+      staticFilesByArch = Object.create(null);
+
+      function generateClientProgram(clientPath, arch) {
+        function addStaticFile(path, item) {
+          if (! hasOwn.call(staticFilesByArch, arch)) {
+            staticFilesByArch[arch] = Object.create(null);
+          }
+          staticFilesByArch[arch][path] = item;
+        }
+
         // read the control for the client we'll be serving up
         var clientJsonPath = pathJoin(__meteor_bootstrap__.serverDir,
                                    clientPath);
@@ -510,27 +590,25 @@ function runWebAppServer() {
         if (! clientJsonPath || ! clientDir || ! clientJson)
           throw new Error("Client config file not parsed.");
 
-        var urlPrefix = getUrlPrefixForArch(arch);
-
         var manifest = clientJson.manifest;
         _.each(manifest, function (item) {
           if (item.url && item.where === "client") {
-            staticFiles[urlPrefix + getItemPathname(item.url)] = {
+            addStaticFile(getItemPathname(item.url), {
               absolutePath: pathJoin(clientDir, item.path),
               cacheable: item.cacheable,
               hash: item.hash,
               // Link from source to its map
               sourceMapUrl: item.sourceMapUrl,
               type: item.type
-            };
+            });
 
             if (item.sourceMap) {
               // Serve the source map too, under the specified URL. We assume all
               // source maps are cacheable.
-              staticFiles[urlPrefix + getItemPathname(item.sourceMapUrl)] = {
+              addStaticFile(getItemPathname(item.sourceMapUrl), {
                 absolutePath: pathJoin(clientDir, item.sourceMap),
                 cacheable: true
-              };
+              });
             }
           }
         });
@@ -556,13 +634,13 @@ function runWebAppServer() {
         const manifestUrl = manifestUrlPrefix +
           getItemPathname("/manifest.json");
 
-        staticFiles[manifestUrl] = {
+        addStaticFile(manifestUrl, {
           content: JSON.stringify(program),
           cacheable: false,
           hash: program.version,
           type: "json"
-        };
-      };
+        });
+      }
 
       try {
         var clientPaths = __meteor_bootstrap__.configJson.clientPaths;
@@ -572,7 +650,7 @@ function runWebAppServer() {
         });
 
         // Exported for tests.
-        WebAppInternals.staticFiles = staticFiles;
+        WebAppInternals.staticFilesByArch = staticFilesByArch;
       } catch (e) {
         Log.error("Error reloading the client program: " + e.stack);
         process.exit(1);
@@ -603,28 +681,41 @@ function runWebAppServer() {
           ROOT_URL: process.env.MOBILE_ROOT_URL ||
             Meteor.absoluteUrl()
         }
-      }
+      },
+
+      "web.browser": {
+        runtimeConfigOverrides: {
+          isModern: true,
+        }
+      },
+
+      "web.browser.legacy": {
+        runtimeConfigOverrides: {
+          isModern: false,
+        }
+      },
     };
 
     syncQueue.runTask(function() {
+      const allCss = [];
+
       _.each(WebApp.clientPrograms, function (program, archName) {
         boilerplateByArch[archName] =
           WebAppInternals.generateBoilerplateInstance(
-            archName, program.manifest,
-            defaultOptionsForArch[archName]);
+            archName,
+            program.manifest,
+            defaultOptionsForArch[archName],
+          );
+
+        const cssFiles = boilerplateByArch[archName].baseData.css;
+        cssFiles.forEach(file => allCss.push({
+          url: bundledJsCssUrlRewriteHook(file.url),
+        }));
       });
 
       // Clear the memoized boilerplate cache.
       memoizedBoilerplate = {};
 
-      // Configure CSS injection for the default arch
-      // XXX implement the CSS injection for all archs?
-      var cssFiles = boilerplateByArch[WebApp.defaultArch].baseData.css;
-      // Rewrite all CSS files (which are written directly to <style> tags)
-      // by autoupdate_client to use the CDN prefix/etc
-      var allCss = _.map(cssFiles, function(cssFile) {
-        return { url: bundledJsCssUrlRewriteHook(cssFile.url) };
-      });
       WebAppInternals.refreshableAssets = { allCss };
     });
   };
@@ -687,7 +778,7 @@ function runWebAppServer() {
   // Serve static files from the manifest.
   // This is inspired by the 'static' middleware.
   app.use(function (req, res, next) {
-    WebAppInternals.staticFilesMiddleware(staticFiles, req, res, next);
+    WebAppInternals.staticFilesMiddleware(staticFilesByArch, req, res, next);
   });
 
   // Core Meteor packages like dynamic-import can add handlers before
@@ -765,21 +856,13 @@ function runWebAppServer() {
         return;
       }
 
-      // /packages/asdfsad ... /__cordova/dafsdf.js
-      var pathname = parseRequest(req).pathname;
-      var archKey = pathname.split('/')[1];
-      var archKeyCleaned = 'web.' + archKey.replace(/^__/, '');
-
-      if (!/^__/.test(archKey) || !_.has(archPath, archKeyCleaned)) {
-        archKey = WebApp.defaultArch;
-      } else {
-        archKey = archKeyCleaned;
-      }
-
       return getBoilerplateAsync(
         request,
-        archKey
-      ).then(({ stream,  statusCode, headers: newHeaders }) => {
+        getArchAndPath(
+          parseRequest(req).pathname,
+          request.browser,
+        ).arch,
+      ).then(({ stream, statusCode, headers: newHeaders }) => {
         if (!statusCode) {
           statusCode = res.statusCode ? res.statusCode : 200;
         }
@@ -860,7 +943,12 @@ function runWebAppServer() {
         onListeningCallbacks.push(f);
       else
         f();
-    }
+    },
+    // This can be overridden by users who want to modify how listening works
+    // (eg, to run a proxy like Apollo Engine Proxy in front of the server).
+    startListening: function (httpServer, listenOptions, cb) {
+      httpServer.listen(listenOptions, cb);
+    },
   });
 
   // Let the rest of the packages (and Meteor.startup hooks) insert connect
@@ -870,7 +958,7 @@ function runWebAppServer() {
     WebAppInternals.generateBoilerplate();
 
     const startHttpServer = listenOptions => {
-      httpServer.listen(listenOptions, Meteor.bindEnvironment(() => {
+      WebApp.startListening(httpServer, listenOptions, Meteor.bindEnvironment(() => {
         if (process.env.METEOR_PRINT_ON_LISTEN) {
           console.log("LISTENING");
         }
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index eade129a94..722583b334 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -2,6 +2,7 @@ const url = require("url");
 const crypto = require("crypto");
 const http = require("http");
 const streamToString = require("stream-to-string");
+import { isModern } from "meteor/modern-browsers";
 
 const additionalScript = "(function () { var foo = 1; })";
 WebAppInternals.addStaticJs(additionalScript);
@@ -44,16 +45,19 @@ MockResponse.prototype.getBody = function () {
 };
 
 Tinytest.add("webapp - content-type header", function (test) {
+  const staticFiles = WebAppInternals.staticFilesByArch["web.browser"];
+
   const cssResource = _.find(
-    _.keys(WebAppInternals.staticFiles),
+    _.keys(staticFiles),
     function (url) {
-      return WebAppInternals.staticFiles[url].type === "css";
+      return staticFiles[url].type === "css";
     }
   );
+
   const jsResource = _.find(
-    _.keys(WebAppInternals.staticFiles),
+    _.keys(staticFiles),
     function (url) {
-      return WebAppInternals.staticFiles[url].type === "js";
+      return staticFiles[url].type === "js";
     }
   );
 
@@ -65,6 +69,83 @@ Tinytest.add("webapp - content-type header", function (test) {
              "application/javascript; charset=utf-8");
 });
 
+const modernUserAgent =
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) " +
+  "AppleWebKit/537.36 (KHTML, like Gecko) " +
+  "Chrome/68.0.3440.15 Safari/537.36";
+
+const legacyUserAgent = "legacy";
+
+Tinytest.addAsync("webapp - modern/legacy static files", test => {
+  test.equal(isModern(WebAppInternals.identifyBrowser(modernUserAgent)), true);
+  test.equal(isModern(WebAppInternals.identifyBrowser(legacyUserAgent)), false);
+
+  const promises = [];
+
+  Object.keys(WebAppInternals.staticFilesByArch).forEach(arch => {
+    const staticFiles = WebAppInternals.staticFilesByArch[arch];
+
+    Object.keys(staticFiles).forEach(path => {
+      const { type } = staticFiles[path];
+      if (type !== "asset") {
+        return;
+      }
+
+      const pathMatch = /\/(modern|legacy)_test_asset\.js$/.exec(path);
+      if (! pathMatch) {
+        return;
+      }
+
+      const absUrl = url.resolve(Meteor.absoluteUrl(), path);
+
+      [ // Try to request the modern/legacy assets with both modern and
+        // legacy User Agent strings. (#9953)
+        modernUserAgent,
+        legacyUserAgent,
+      ].forEach(ua => promises.push(new Promise((resolve, reject) => {
+        HTTP.get(absUrl, {
+          headers: {
+            "User-Agent": ua
+          }
+        }, (error, response) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+
+          if (response.statusCode !== 200) {
+            reject(new Error(`Bad status code ${
+              response.statusCode
+            } for ${path}`));
+            return;
+          }
+
+          const contentType = response.headers["content-type"];
+          if (! contentType.startsWith("application/javascript")) {
+            reject(new Error(`Bad Content-Type ${contentType} for ${path}`));
+            return;
+          }
+
+          const expectedText = pathMatch[1].toUpperCase();
+          const index = response.content.indexOf(expectedText);
+          if (index < 0) {
+            reject(new Error(`Missing ${
+              JSON.stringify(expectedText)
+            } text in ${path}`));
+            return;
+          }
+
+          resolve(path);
+        });
+      })));
+    });
+  });
+
+  test.isTrue(promises.length > 0);
+
+  return Promise.all(promises);
+});
+
 Tinytest.addAsync(
   "webapp - additional static javascript",
   async function (test) {
@@ -98,10 +179,12 @@ Tinytest.addAsync(
       req.method = "GET";
       req.url = "/" + additionalScriptPathname;
       let nextCalled = false;
-      WebAppInternals.staticFilesMiddleware(
-        staticFilesOpts, req, res, function () {
-          nextCalled = true;
-        });
+      WebAppInternals.staticFilesMiddleware({
+        "web.browser": {},
+        "web.browser.legacy": {},
+      }, req, res, function () {
+        nextCalled = true;
+      });
       test.isTrue(nextCalled);
 
       // When inline scripts are disallowed, the script body should not be
@@ -130,8 +213,10 @@ Tinytest.addAsync(
     req.headers = {};
     req.method = "GET";
     req.url = "/" + additionalScriptPathname;
-    WebAppInternals.staticFilesMiddleware(staticFilesOpts, req, res,
-                                          function () { });
+    WebAppInternals.staticFilesMiddleware({
+      "web.browser": {},
+      "web.browser.legacy": {},
+    }, req, res, function () {});
     const resBody = res.getBody();
     test.isTrue(resBody.indexOf(additionalScript) !== -1);
     test.equal(res.statusCode, 200);
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 33ab65beed..873da558e9 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "1.6.1.1-rc.0",
+  "version": "1.7.0.3-rc.0",
   "recommended": false,
   "official": false,
   "description": "Meteor"
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 7265e8a8a0..2716086cd7 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,12 +1,12 @@
 {
   "track": "METEOR",
-  "version": "1.6.1.1",
+  "version": "1.7.0.3",
   "recommended": false,
   "official": true,
   "patchFrom": [
-    "1.6",
-    "1.6.0.1",
-    "1.6.1"
+    "1.7",
+    "1.7.0.1",
+    "1.7.0.2"
   ],
   "description": "The Official Meteor Distribution"
 }
diff --git a/scripts/admin/test-packages-with-mongo-versions.rb b/scripts/admin/test-packages-with-mongo-versions.rb
index 807eaae342..e33175366b 100755
--- a/scripts/admin/test-packages-with-mongo-versions.rb
+++ b/scripts/admin/test-packages-with-mongo-versions.rb
@@ -7,7 +7,7 @@
 require 'tmpdir'
 
 mongo_install_urls = {
-  "3.6.3" => "https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz",
+  "3.6.4" => "https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.4.tgz",
   "3.2.19" => "https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-3.2.19.tgz",
   "3.0.5" => "https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-3.0.5.tgz",
   "2.6.10" => "http://downloads.mongodb.org/osx/mongodb-osx-x86_64-2.6.10.tgz"
@@ -29,7 +29,7 @@ puts "Putting output in: #{path_to_output}/"
 
 test_env = "TEST_PACKAGES_EXCLUDE=\"less\""
 
-["3.6.3", "3.2.19", "3.0.5", "2.6.10"].each do |mongo_version|
+["3.6.4", "3.2.19", "3.0.5", "2.6.10"].each do |mongo_version|
   puts "Installing and testing with Mongo #{mongo_version}..."
 
   Dir.mktmpdir "mongo_install" do |mongo_install_dir|
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index d2d053a820..696cbc77bb 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,13 +5,13 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=8.11.1
-MONGO_VERSION_64BIT=3.6.3
+NODE_VERSION=8.11.3
+MONGO_VERSION_64BIT=3.6.4
 MONGO_VERSION_32BIT=3.2.19
-NPM_VERSION=5.8.0
+NPM_VERSION=5.10.0
 
 # If we built Node from source on Jenkins, this is the build number.
-NODE_BUILD_NUMBER=129
+NODE_BUILD_NUMBER=
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index adfddacaa6..e146991018 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,17 +10,17 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "5.8.0",
+    npm: "5.10.0",
     pacote: "https://github.com/meteor/pacote/tarball/2c16c509074bbba8ca5dd410caf808412ce79e6c",
     "node-gyp": "3.6.2",
     "node-pre-gyp": "0.6.36",
-    "meteor-babel": "7.0.0-beta.46",
+    "meteor-babel": "7.0.0-beta.51",
     "meteor-promise": "0.8.6",
     promise: "8.0.1",
-    reify: "0.15.1",
+    reify: "0.16.2",
     fibers: "2.0.0",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.
-    "@babel/runtime": "7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.51",
     // For backwards compatibility with isopackets that still depend on
     // babel-runtime rather than @babel/runtime.
     "babel-runtime": "7.0.0-beta.3",
@@ -52,9 +52,8 @@ var packageJson = {
     split2: "2.2.0",
     multipipe: "2.0.1",
     pathwatcher: "7.1.1",
-    optimism: "0.4.0",
-    'lru-cache': '4.1.1',
-    longjohn: '0.2.12'
+    optimism: "0.6.3",
+    'lru-cache': '4.1.3'
   }
 };
 
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 5b0058aa1e..39b19c0c83 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -20,9 +20,11 @@ $BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_V
 # extract the major package versions from the build-dev-bundle-common script.
 $MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
 $MONGO_VERSION_32BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_32BIT'
-$NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
+
 $NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
 
+$NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
+
 # 7-zip path.
 $system7zip = "C:\Program Files\7-zip\7z.exe"
 
@@ -107,7 +109,11 @@ Function Add-Python {
 }
 
 Function Add-NodeAndNpm {
-  $nodeUrlBase = 'https://nodejs.org/dist'
+  if ("${NODE_VERSION}" -match "-rc\.\d+$") {
+    $nodeUrlBase = 'https://nodejs.org/download/rc'
+  } else {
+    $nodeUrlBase = 'https://nodejs.org/dist'
+  }
 
   if ($PLATFORM -eq "windows_x86") {
     $nodeArchitecture = 'win-x86'
@@ -245,11 +251,23 @@ Function Add-Mongo {
     $shell.Namespace("$DIR\mongodb").copyhere($item, 0x14) # 0x10 - overwrite, 0x4 - no dialog
   }
 
-  Write-Host "Putting MongoDB mongod.exe in \mongodb\bin\" -ForegroundColor Magenta
+  Write-Host "Putting MongoDB mongod.exe in mongodb\bin" -ForegroundColor Magenta
   cp "$DIR\mongodb\$mongo_name\bin\mongod.exe" $DIR\mongodb\bin
-  Write-Host "Putting MongoDB mongo.exe in \mongodb\bin\" -ForegroundColor Magenta
+  Write-Host "Putting MongoDB mongo.exe in mongodb\bin" -ForegroundColor Magenta
   cp "$DIR\mongodb\$mongo_name\bin\mongo.exe" $DIR\mongodb\bin
 
+  # https://jira.mongodb.org/browse/SERVER-19086
+  $libeay32dll = "$DIR\mongodb\$mongo_name\bin\libeay32.dll"
+  if (Test-Path $libeay32dll) {
+    Write-Host "Putting MongoDB libeay32.dll in mongodb\bin" -ForegroundColor Magenta
+    cp $libeay32dll $DIR\mongodb\bin
+  }
+  $ssleay32dll = "$DIR\mongodb\$mongo_name\bin\ssleay32.dll"
+  if (Test-Path $ssleay32dll) {
+    Write-Host "Putting MongoDB ssleay32.dll in mongodb\bin" -ForegroundColor Magenta
+    cp $ssleay32dll $DIR\mongodb\bin
+  }
+
   Write-Host "Removing the old Mongo zip..." -ForegroundColor Magenta
   rm -Recurse -Force $mongo_zip
   Write-Host "Removing the old Mongo directory..." -ForegroundColor Magenta
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 8023156fa0..495e236769 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -42,8 +42,15 @@ downloadOfficialNode() {
     curl "${NODE_URL}" | tar zx --strip-components 1
 }
 
+downloadReleaseCandidateNode() {
+    NODE_URL="https://nodejs.org/download/rc/v${NODE_VERSION}/${NODE_TGZ}"
+    echo "Downloading Node from ${NODE_URL}" >&2
+    curl "${NODE_URL}" | tar zx --strip-components 1
+}
+
 # Try each strategy in the following order:
-extractNodeFromTarGz || downloadNodeFromS3 || downloadOfficialNode
+extractNodeFromTarGz || downloadNodeFromS3 || \
+  downloadOfficialNode || downloadReleaseCandidateNode
 
 # Download Mongo from mongodb.com. Will download a 64-bit version of Mongo
 # by default. Will download a 32-bit version of Mongo if using a 32-bit based
diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 175e040579..85ea491d0f 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -933,9 +933,22 @@ main.registerCommand({
               throw Error("no isopack for " + packageName);
             }
 
-            var existingBuild =
-                  catalog.official.getBuildWithPreciseBuildArchitectures(
-                    oldVersionRecord, isopk.buildArchitectures());
+            const existingBuild =
+              // First try with the non-simplified build architecture
+              // list, which is likely to be something like
+              // os+web.browser+web.browser.legacy+web.cordova:
+              catalog.official.getBuildWithPreciseBuildArchitectures(
+                oldVersionRecord,
+                isopk.buildArchitectures(),
+              ) ||
+              // If that fails, fall back to the simplified architecture
+              // list (e.g. os+web.browser+web.cordova), to match packages
+              // published before the web.browser.legacy architecture was
+              // introduced (in Meteor 1.7).
+              catalog.official.getBuildWithPreciseBuildArchitectures(
+                oldVersionRecord,
+                isopk.buildArchitectures(true),
+              );
 
             var somethingChanged;
 
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index f84bed0919..e121c1a744 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -382,9 +382,12 @@ function doRunCommand(options) {
     runLog.setRawLogs(true);
   }
 
-  let webArchs = ['web.browser'];
-  if (!_.isEmpty(runTargets) || options['mobile-server']) {
-    webArchs.push("web.cordova");
+  let webArchs = projectContext.platformList.getWebArchs();
+  if (! _.isEmpty(runTargets) ||
+      options['mobile-server']) {
+    if (webArchs.indexOf("web.cordova") < 0) {
+      webArchs.push("web.cordova");
+    }
   }
 
   let cordovaRunner;
@@ -419,7 +422,7 @@ function doRunCommand(options) {
     settingsFile: options.settings,
     buildOptions: {
       minifyMode: options.production ? 'production' : 'development',
-      buildMode: options.production && 'production',
+      buildMode: options.production ? 'production' : 'development',
       webArchs: webArchs
     },
     rootUrl: process.env.ROOT_URL,
@@ -486,8 +489,9 @@ main.registerCommand({
     list: { type: Boolean },
     example: { type: String },
     package: { type: Boolean },
+    bare: { type: Boolean },
+    minimal: { type: Boolean },
     full: { type: Boolean },
-    bare: { type: Boolean }
   },
   catalogRefresh: new catalog.Refresh.Never()
 }, function (options) {
@@ -731,13 +735,13 @@ main.registerCommand({
     toIgnore.push(/(\.html|\.js|\.css)/)
   }
 
-  let skelName = 'skel';
-
-  if(options.bare){
-    skelName += '-bare';
-  }
-  else if(options.full){
-    skelName += '-full';
+  let skelName = "skel";
+  if (options.minimal) {
+    skelName += "-minimal";
+  } else if (options.bare) {
+    skelName += "-bare";
+  } else if (options.full) {
+    skelName += "-full";
   }
 
   files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', skelName), appPath, {
@@ -818,6 +822,12 @@ main.registerCommand({
   // do next.
   Console.info("To run your new app:");
 
+  function cmd(text) {
+    Console.info(Console.command(text), Console.options({
+      indent: 2
+    }));
+  }
+
   if (appPathAsEntered !== ".") {
     // Wrap the app path in quotes if it contains spaces
     const appPathWithQuotesIfSpaces = appPathAsEntered.indexOf(' ') === -1 ?
@@ -825,13 +835,10 @@ main.registerCommand({
       `'${appPathAsEntered}'`;
 
     // Don't tell people to 'cd .'
-    Console.info(
-      Console.command("cd " + appPathWithQuotesIfSpaces),
-        Console.options({ indent: 2 }));
+    cmd("cd " + appPathWithQuotesIfSpaces);
   }
 
-  Console.info(
-    Console.command("meteor"), Console.options({ indent: 2 }));
+  cmd("meteor");
 
   Console.info("");
   Console.info("If you are new to Meteor, try some of the learning resources here:");
@@ -839,13 +846,21 @@ main.registerCommand({
     Console.url("https://www.meteor.com/tutorials"),
       Console.options({ indent: 2 }));
 
-  if (!options.full && !options.bare){
-    // Notice people about --bare and --full
-    const bareOptionNotice = 'meteor create --bare to create an empty app.';
-    const fullOptionNotice = 'meteor create --full to create a scaffolded app.';
+  if (! options.bare &&
+      ! options.minimal &&
+      ! options.full) {
+    // Notify people about --bare, --minimal, and --full.
+    Console.info([
+      "",
+      "To start with a different app template, try one of the following:",
+      "",
+    ].join("\n"));
 
-    Console.info("");
-    Console.info(bareOptionNotice + '\n' + fullOptionNotice);
+    cmd("meteor create --bare    # to create an empty app");
+    cmd("meteor create --minimal # to create an app with as few " +
+        "Meteor packages as possible");
+    cmd("meteor create --full    # to create a more complete " +
+        "scaffolded app");
   }
 
   Console.info("");
diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 136f6b0693..ce0ffa13d3 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -70,6 +70,10 @@ exports.getEnv = function (options) {
     var paths = [
       // When npm looks for node, it must find dev_bundle/bin/node.
       path.join(devBundleDir, "bin"),
+
+      // When npm looks for meteor, it should find dev_bundle/../meteor.
+      path.dirname(devBundleDir),
+
       // Also make available any scripts installed by packages in
       // dev_bundle/lib/node_modules, such as node-gyp.
       path.join(devBundleDir, "lib", "node_modules", ".bin")
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index 6fb6c735dc..5ab4b3ebc4 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -142,15 +142,16 @@ Options:
 
 >>> create
 Create a new project.
-Usage: meteor create [--release <release>] [--bare|--full] <path>
+Usage: meteor create [--release <release>] [--bare|--minimal|--full] <path>
        meteor create [--release <release>] --example <example_name> [<path>]
        meteor create --list
        meteor create --package [<package_name>]
 
 Make a subdirectory named <path> if it doesn't exist and create a new Meteor app
 there. You can pass an absolute path, relative path, or '.' for the current
-directory. Use the --bare option to create an empty app. To scaffold the app
-use the --full option.
+directory. Use the --bare option to create an empty app, or the --minimal option
+to create an empty app with as few Meteor packages as possible. To scaffold a
+more complete app, use the --full option.
 
 With the --package option, creates a Meteor package instead of an app. If you're
 in an app, the package will go in the app's top-level 'packages' directory;
@@ -170,7 +171,8 @@ Options:
   --example  Example template to use.
   --list     Show list of available examples.
   --bare     Create an empty app.
-  --full     Create a scaffolded app.
+  --minimal  Create an app with as few Meteor packages as possible.
+  --full     Create a fully scaffolded app.
 
 
 >>> update
@@ -632,7 +634,7 @@ that your tests can inspect and interact with the full running application.
 Test files are loaded similarly to 'meteor test' mode, but must be called
 *.app-test[s].* or *.app-spec[s].*.
 
-Note: as of Meteor 1.6.2, you can override the default test loading rules
+Note: as of Meteor 1.7, you can override the default test loading rules
 described in the previous two paragraphs by including a meteor.testModule
 section in your package.json file:
 
diff --git a/tools/cli/main.js b/tools/cli/main.js
index c5f08eba7e..1ccf77ebe8 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -539,6 +539,10 @@ var springboard = function (rel, options) {
     process.env['METEOR_SPRINGBOARD_RELEASE'] = options.releaseOverride;
   }
 
+  // Release our connection to the sqlite catalog database for the current
+  // process, so that the springboarded process can reestablish it.
+  catalog.official.closePermanently();
+
   if (process.platform === 'win32') {
     process.exit(new Promise(function (resolve) {
       var batPath = files.convertToOSPath(executable + ".bat");
@@ -562,6 +566,10 @@ var oldSpringboard = function (toolsVersion) {
   var cmd =
     files.pathJoin(warehouse.getToolsDir(toolsVersion), 'bin', 'meteor');
 
+  // Release our connection to the sqlite catalog database for the current
+  // process, so that the springboarded process can reestablish it.
+  catalog.official.closePermanently();
+
   // Now exec; we're not coming back.
   require('kexec')(cmd, newArgv);
   throw Error('exec failed?');
diff --git a/tools/cordova/builder.js b/tools/cordova/builder.js
index a4d20c06c6..a81b37fbac 100644
--- a/tools/cordova/builder.js
+++ b/tools/cordova/builder.js
@@ -4,6 +4,7 @@ import path from 'path';
 import { Console } from '../console/console.js';
 import buildmessage from '../utils/buildmessage.js';
 import files from '../fs/files.js';
+import { optimisticReadJsonOrNull } from "../fs/optimistic.js";
 import bundler from '../isobuild/bundler.js';
 import archinfo from '../utils/archinfo.js';
 import release from '../packaging/release.js';
@@ -514,6 +515,15 @@ export class CordovaBuilder {
 }
 
 function createAppConfiguration(builder) {
+  const { settingsFile } = builder.options;
+  let settings = null;
+  if (settingsFile) {
+    settings = optimisticReadJsonOrNull(settingsFile);
+    if (! settings) {
+      throw new Error("Unreadable --settings file: " + settingsFile);
+    }
+  }
+
   /**
    * @namespace App
    * @global
@@ -560,6 +570,15 @@ Valid platforms are: ios, android.`);
       }
     },
 
+    /**
+     * @summary Like `Meteor.settings`, contains data read from a JSON
+     *          file provided via the `--settings` command-line option at
+     *          build time, or null if no settings were provided.
+     * @memberOf App
+     * @type {Object}
+     */
+    settings,
+
     /**
      * @summary Set the build-time configuration for a Cordova plugin.
      * @param {String} id The identifier of the plugin you want to
diff --git a/tools/fs/files.js b/tools/fs/files.js
index f5286fc165..31cd75f2f4 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -529,19 +529,29 @@ files.cp_r = function(from, to, options = {}) {
 // create a symlink, overwriting the target link, file, or directory
 // if it exists
 export function symlinkWithOverwrite(source, target) {
+  const args = [source, target];
+
+  if (process.platform === "win32") {
+    const absoluteSource = files.pathResolve(target, source);
+
+    if (files.stat(absoluteSource).isDirectory()) {
+      args[2] = "junction";
+    }
+  }
+
   try {
-    files.symlink(source, target);
+    files.symlink(...args);
   } catch (e) {
     if (e.code === "EEXIST") {
+      if (files.lstat(target).isSymbolicLink() &&
+          files.readlink(target) === source) {
+        // If the target already points to the desired source, we don't
+        // need to do anything.
+        return;
+      }
       // overwrite existing link, file, or directory
       files.rm_recursive(target);
-      files.symlink(source, target);
-    } else if (e.code === "EPERM" &&
-               process.platform === "win32") {
-      files.rm_recursive(target);
-      // This will work only if source refers to a directory, but that's a
-      // chance worth taking.
-      files.symlink(source, target, "junction");
+      files.symlink(...args);
     } else {
       throw e;
     }
@@ -1654,7 +1664,10 @@ let dependOnPathSalt = 0;
 export const dependOnPath = require("optimism").wrap(
   // Always return something different to prevent optimism from
   // second-guessing the dirtiness of this function.
-  path => ++dependOnPathSalt
+  path => ++dependOnPathSalt,
+  // This function is disposable because we don't care about its result,
+  // only its role in optimistic dependency tracking/dirtying.
+  { disposable: true }
 );
 
 function wrapDestructiveFsFunc(name, pathArgIndices) {
diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index eb596a8fbf..4bddc674be 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -163,7 +163,11 @@ const dependOnDirectory = wrap(dir => {
         watcher = null;
       }
     };
-  }
+  },
+
+  // This function is disposable because we don't care about its result,
+  // only its role in optimistic dependency tracking/dirtying.
+  disposable: true
 });
 
 // Called when an optimistic function detects the given file does not
@@ -189,6 +193,10 @@ const dependOnNodeModules = wrap(nodeModulesDir => {
   assert(pathIsAbsolute(nodeModulesDir));
   assert(nodeModulesDir.endsWith(pathSep + "node_modules"));
   return dependOnDirectory(nodeModulesDir);
+}, {
+  // This function is disposable because we don't care about its result,
+  // only its role in optimistic dependency tracking/dirtying.
+  disposable: true
 });
 
 // Invalidate all optimistic results derived from paths involving the
diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index ab0d2dc143..a5a2e01f56 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -11,6 +11,9 @@ import {
   optimisticHashOrNull,
 } from "./optimistic.js";
 
+const WATCH_COALESCE_MS =
+  process.env.METEOR_FILE_WATCH_COALESCE_MS || 100;
+
 // Watch for changes to a set of files, and the first time that any of
 // the files change, call a user-provided callback. (If you want a
 // second callback, you'll need to create a second Watcher.)
@@ -496,11 +499,12 @@ export class Watcher {
     // --hard), or a file was deleted and then recreated by an editor like
     // Vim. Because detecting changes can be costly, and because we care
     // most about the settled state of the file system, we use the
-    // funcUtils.coalesce helper to delay calls to the callback by 100ms,
-    // canceling any additional calls if they happen within that window of
-    // time, so that a rapid succession of calls will tend to trigger only
-    // one inspection of the file system.
-    return coalesce(100, function onWatchEvent() {
+    // funcUtils.coalesce helper to delay calls to the callback by
+    // METEOR_FILE_WATCH_COALESCE_MS or 100 milliseconds, canceling any
+    // additional calls if they happen within that window of time, so that
+    // a rapid succession of calls will tend to trigger only one inspection
+    // of the file system.
+    return coalesce(WATCH_COALESCE_MS, function onWatchEvent() {
       if (self.stopped) {
         return;
       }
diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index b9566acf2b..6637d6428e 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -135,7 +135,15 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
         if (partial in this.previousUsedAsFile) {
           if (this.previousUsedAsFile[partial]) {
             // was previously used as file, delete it, create a directory
-            files.unlink(partial);
+            try {
+              files.unlink(partial);
+            } catch (e) {
+              // If files.unlink(partial) failed because the file does not
+              // exist, then we can just pretend the unlink succeeded.
+              if (e.code !== "ENOENT") {
+                throw e;
+              }
+            }
           } else {
             // is already a directory
             needToMkdir = false;
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 2cd07f968f..e3c9b62d93 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -566,6 +566,23 @@ class File {
     // file is not intended to be served over HTTP).
     this.url = null;
 
+    // A prefix that will be prepended to this.url.
+    // Prefixing is currently restricted to web.cordova URLs.
+    if (options.arch.startsWith("web.") &&
+        // Using the isModern function from the modern-browsers package,
+        // the webapp and dynamic-import packages can automatically
+        // determine whether a client should receive resources from the
+        // web.browser or web.browser.legacy architecture, so those
+        // architectures do not need a URL prefix. Other architectures,
+        // such as web.cordova, still need a prefix like /__cordova/.
+        options.arch !== "web.browser" &&
+        options.arch !== "web.browser.legacy") {
+      this.urlPrefix = "/__" +
+        options.arch.split(".").slice(1).join(".");
+    } else {
+      this.urlPrefix = "";
+    }
+
     // Is this file guaranteed to never change, so that we can let it be
     // cached forever? Only makes sense of self.url is set.
     this.cacheable = options.cacheable || false;
@@ -644,7 +661,8 @@ class File {
   // url, useful for query parameters.
   setUrlToHash(fileAndUrlSuffix, urlSuffix) {
     urlSuffix = urlSuffix || "";
-    this.url = "/" + this.hash() + fileAndUrlSuffix + urlSuffix;
+    this.url = this.urlPrefix + "/" +
+      this.hash() + fileAndUrlSuffix + urlSuffix;
     this.cacheable = true;
     this.targetPath = this.hash() + fileAndUrlSuffix;
   }
@@ -668,7 +686,7 @@ class File {
   // Given a relative path like 'a/b/c' (where '/' is this system's
   // path component separator), produce a URL that always starts with
   // a forward slash and that uses a literal forward slash as the
-  // component separator.
+  // component separator. Also optionally add browser.legacy prefix.
   setUrlFromRelPath(relPath) {
     var url = relPath;
 
@@ -679,7 +697,7 @@ class File {
     // XXX replacing colons with underscores as colon is hard to escape later
     // on different targets and generally is not a good separator for web.
     url = colonConverter.convert(url);
-    this.url = url;
+    this.url = this.urlPrefix + url;
   }
 
   setTargetPathFromRelPath(relPath) {
@@ -1079,25 +1097,40 @@ class Target {
           return;
         }
 
-        const f = new File({
+        const fileOptions = {
           info: 'unbuild ' + resource,
+          arch: this.arch,
           data: resource.data,
           cacheable: false,
-          hash: resource.hash
-        });
+          hash: resource.hash,
+        };
 
-        const relPath = isOs
-              ? files.pathJoin('assets', resource.servePath)
-              : stripLeadingSlash(resource.servePath);
-        f.setTargetPathFromRelPath(relPath);
+        const file = new File(fileOptions);
+        const assetFiles = [file];
 
-        if (isWeb) {
-          f.setUrlFromRelPath(resource.servePath);
-        } else {
-          unibuildAssets[resource.path] = resource.data;
+        if (file.urlPrefix.length > 0) {
+          const noPrefix = new File(fileOptions);
+          noPrefix.urlPrefix = "";
+          // If the file has a URL prefix, add another resource for this
+          // asset without the prefix.
+          assetFiles.push(noPrefix);
         }
 
-        this.asset.push(f);
+        assetFiles.forEach(f => {
+          const relPath = isOs
+            ? files.pathJoin('assets', resource.servePath)
+            : stripLeadingSlash(resource.servePath);
+
+          f.setTargetPathFromRelPath(relPath);
+
+          if (isWeb) {
+            f.setUrlFromRelPath(resource.servePath);
+          } else {
+            unibuildAssets[resource.path] = resource.data;
+          }
+
+          this.asset.push(f);
+        });
       });
 
       // Now look for the other kinds of resources.
@@ -1125,7 +1158,12 @@ class Target {
             return;
           }
 
-          const f = new File({ info: 'resource ' + resource.servePath, data: resource.data, cacheable: false});
+          const f = new File({
+            info: 'resource ' + resource.servePath,
+            arch: this.arch,
+            data: resource.data,
+            cacheable: false,
+          });
 
           const relPath = stripLeadingSlash(resource.servePath);
           f.setTargetPathFromRelPath(relPath);
@@ -1204,9 +1242,10 @@ class Target {
   minifyJs(minifierDef, minifyMode) {
     const staticFiles = [];
     const dynamicFiles = [];
+    const { arch } = this;
 
     this.js.forEach(file => {
-      const jsf = new JsFile(file, { arch: this.arch });
+      const jsf = new JsFile(file, { arch });
 
       if (file.targetPath.startsWith("dynamic/")) {
         // Make sure file._hash is cached.
@@ -1260,6 +1299,7 @@ class Target {
 
         const newFile = new File({
           info: 'minified js',
+          arch,
           data: Buffer.from(file.data, 'utf8'),
         });
 
@@ -1288,6 +1328,7 @@ class Target {
           const contents = newFile.contents();
           const statsFile = new File({
             info: "bundle size stats JSON",
+            arch,
             data: Buffer.from(JSON.stringify({
               minifier: {
                 name: minifierDef.isopack.name,
@@ -1479,10 +1520,9 @@ class ClientTarget extends Target {
 
   // Minify the CSS in this target
   minifyCss(minifierDef, minifyMode) {
+    const { arch } = this;
     const sources = this.css.map((file) => {
-      return new CssFile(file, {
-        arch: this.arch
-      });
+      return new CssFile(file, { arch });
     });
     const minifier = minifierDef.userPlugin.processFilesForBundle.bind(
       minifierDef.userPlugin);
@@ -1500,6 +1540,7 @@ class ClientTarget extends Target {
       return source._minifiedFiles.map((file) => {
         const newFile = new File({
           info: 'minified css',
+          arch,
           data: Buffer.from(file.data, 'utf8')
         });
         if (file.sourceMap) {
@@ -1539,9 +1580,28 @@ class ClientTarget extends Target {
 
     // Reserve all file names from the manifest, so that interleaved
     // generateFilename calls don't overlap with them.
-    eachResource((file, type) =>
-      builder.reserve(file.targetPath)
-    );
+
+    const targetPathToHash = new Map;
+    eachResource((file, type) => {
+      const hash = targetPathToHash.get(file.targetPath);
+      if (hash) {
+        // When we add assets that have a URL prefix like /__cordova, we
+        // also add them without the prefix, which means there could be
+        // collisions between target paths, causing builder.reserve to
+        // throw an exception. However, we tolerate collisions (and call
+        // builder.reserve only once) if the hashes of the two assets are
+        // identical, which should always be the case when we register a
+        // single asset using multiple target paths. If the hashes do not
+        // match for some reason, we just call builder.reserve again and
+        // let it throw.
+        if (file.hash() === hash) {
+          return;
+        }
+      } else {
+        targetPathToHash.set(file.targetPath, file.hash());
+      }
+      builder.reserve(file.targetPath);
+    });
 
     // Build up a manifest of all resources served via HTTP.
     const manifest = [];
@@ -2134,6 +2194,10 @@ class JsImage {
         delete loadItem.node_modules;
       }
 
+      // Will be initialized with a Buffer version of item.source, with
+      // //# sourceMappingURL comments appropriately removed/appended.
+      let sourceBuffer;
+
       if (item.sourceMap) {
         const sourceMapBuffer =
           Buffer.from(JSON.stringify(item.sourceMap), "utf8");
@@ -2149,7 +2213,7 @@ class JsImage {
 
         // Remove any existing sourceMappingURL line. (eg, if roundtripping
         // through JsImage.readFromDisk, don't end up with two!)
-        item.source = addSourceMappingURL(
+        sourceBuffer = addSourceMappingURL(
           item.source,
           sourceMappingURL,
           item.targetPath,
@@ -2158,11 +2222,17 @@ class JsImage {
         if (item.sourceMapRoot) {
           loadItem.sourceMapRoot = item.sourceMapRoot;
         }
+      } else {
+        // If we do not have an item.sourceMap, then we still want to
+        // remove any existing //# sourceMappingURL comments.
+        // https://github.com/meteor/meteor/issues/9894
+        sourceBuffer = removeSourceMappingURLs(item.source);
       }
 
       loadItem.path = builder.writeToGeneratedFilename(
         item.targetPath,
-        { data: Buffer.from(item.source, 'utf8') });
+        { data: sourceBuffer }
+      );
 
       if (!_.isEmpty(item.assets)) {
         // For package code, static assets go inside a directory inside
@@ -2539,10 +2609,7 @@ var writeFile = Profile("bundler writeFile", function (file, builder, options) {
   if (! file.targetPath) {
     throw new Error("No targetPath?");
   }
-  var contents = file.contents();
-  if (! (contents instanceof Buffer)) {
-    throw new Error("contents not a Buffer?");
-  }
+
   // XXX should probably use sanitize: true, but that will have
   // to wait until the server is actually driven by the manifest
   // (rather than just serving all of the files in a certain
@@ -2553,35 +2620,67 @@ var writeFile = Profile("bundler writeFile", function (file, builder, options) {
 
   if (options && options.sourceMapUrl) {
     data = addSourceMappingURL(data, options.sourceMapUrl);
-  }
-
-  if (! Buffer.isBuffer(data)) {
-    data = Buffer.from(data, "utf8");
+  } else {
+    // If we do not have an options.sourceMapUrl to append, then we still
+    // want to remove any existing //# sourceMappingURL comments.
+    // https://github.com/meteor/meteor/issues/9894
+    data = removeSourceMappingURLs(data);
   }
 
   builder.write(file.targetPath, { data, hash });
 });
 
+// Takes a Buffer or string and returns a Buffer. If it looks like there
+// are no //# sourceMappingURL comments to remove, an attempt is made to
+// return the provided buffer without modification.
+function removeSourceMappingURLs(data) {
+  if (Buffer.isBuffer(data)) {
+    // Unfortuantely there is no way to search a Buffer using a RegExp, so
+    // there's a chance of false positives here, which could lead to
+    // unnecessarily stringifying and re-Buffer.from-ing the data, though
+    // that should not cause any logical problems.
+    if (! data.includes("//# source", 0, "utf8")) {
+      return data;
+    }
+    data = data.toString("utf8");
+  }
+
+  // Remove any/all existing //# sourceMappingURL comments using
+  // String#replace (since unfortunately there is no Buffer#replace).
+  data = data.replace(/\n\/\/# source(?:Mapping)?URL=[^\n]+/g, "\n");
+
+  // Always return a Buffer.
+  return Buffer.from(data, "utf8");
+}
+
+const newLineBuffer = Buffer.from("\n", "utf8");
+
 // The data argument may be either a Buffer or a string, but this function
-// always returns a string.
+// always returns a Buffer.
 function addSourceMappingURL(data, url, targetPath) {
-  const parts = [
-    // If data is a Buffer, convert it to a string.
-    data.toString("utf8")
-      // Remove any existing sourceURL or sourceMappingURL comments.
-      .replace(/\n\/\/# source(?:Mapping)?URL=[^\n]+/g, '\n')
-  ];
+  // An array of Buffer objects, even when data is a string.
+  const parts = [removeSourceMappingURLs(data)];
 
   if (targetPath) {
     // If a targetPath was provided, use it to add a sourceURL comment to
     // help associate output files with mapped source files.
-    parts.push(`//# sourceURL=${SOURCE_URL_PREFIX}/${targetPath}`);
+    parts.push(
+      newLineBuffer,
+      Buffer.from(
+        `//# sourceURL=${SOURCE_URL_PREFIX}/${targetPath}`,
+        "utf8"
+      )
+    );
   }
 
-  parts.push(`//# sourceMappingURL=${url}`);
-  parts.push(""); // Trailing newline.
+  parts.push(
+    newLineBuffer,
+    Buffer.from("//# sourceMappingURL=" + url, "utf8"),
+    newLineBuffer // trailing newline
+  );
 
-  return parts.join("\n");
+  // Always return a Buffer.
+  return Buffer.concat(parts);
 }
 
 // Writes a target a path in 'programs'
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 1d22b22bac..0eb33129bb 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -18,10 +18,13 @@ import {cssToCommonJS} from "./css-modules.js";
 import Resolver from "./resolver.js";
 import {
   optimisticStatOrNull,
+  optimisticReadJsonOrNull,
 } from "../fs/optimistic.js";
 
 import { isTestFilePath } from './test-files.js';
 
+const hasOwn = Object.prototype.hasOwnProperty;
+
 // This file implements the new compiler plugins added in Meteor 1.2, which are
 // registered with the Plugin.registerCompiler API.
 //
@@ -62,7 +65,7 @@ import { isTestFilePath } from './test-files.js';
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 19; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 20; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.
@@ -220,6 +223,11 @@ class InputFile extends buildPluginModule.InputFile {
     // Map from imported module identifier strings (possibly relative) to
     // fully require.resolve'd module identifiers.
     this._resolveCache = Object.create(null);
+
+    // Communicate to compiler plugins that methods like addJavaScript
+    // accept a lazy finalizer function as a second argument, so that
+    // compilation can be avoided until/unless absolutely necessary.
+    this.supportsLazyCompilation = true;
   }
 
   getContentsAsBuffer() {
@@ -366,7 +374,12 @@ class InputFile extends buildPluginModule.InputFile {
     }
 
     const batch = this._resourceSlot.packageSourceBatch;
-    const resolver = batch.getResolver();
+    const resolver = batch.getResolver({
+      // Make sure we use a server architecture when resolving, so that we
+      // don't accidentally use package.json "browser" fields.
+      // https://github.com/meteor/meteor/issues/9870
+      targetArch: archinfo.host(),
+    });
     const resolved = resolver.resolve(id, parentPath);
 
     if (resolved === "missing") {
@@ -439,16 +452,16 @@ class InputFile extends buildPluginModule.InputFile {
    * @param {String|Object} options.sourceMap A stringified JSON
    * sourcemap, in case the stylesheet was generated from a different
    * file.
+   * @param {Function} lazyFinalizer Optional function that can be called
+   *                   to obtain any remaining options that may be
+   *                   expensive to compute, and thus should only be
+   *                   computed if/when we are sure this CSS will be used
+   *                   by the application.
    * @memberOf InputFile
    * @instance
    */
-  addStylesheet(options) {
-    var self = this;
-    if (options.sourceMap && typeof options.sourceMap === 'string') {
-      // XXX remove an anti-XSSI header? ")]}'\n"
-      options.sourceMap = JSON.parse(options.sourceMap);
-    }
-    self._resourceSlot.addStylesheet(options);
+  addStylesheet(options, lazyFinalizer) {
+    this._resourceSlot.addStylesheet(options, lazyFinalizer);
   }
 
   /**
@@ -464,16 +477,16 @@ class InputFile extends buildPluginModule.InputFile {
    * @param {String|Object} options.sourceMap A stringified JSON
    * sourcemap, in case the JavaScript file was generated from a
    * different file.
+   * @param {Function} lazyFinalizer Optional function that can be called
+   *                   to obtain any remaining options that may be
+   *                   expensive to compute, and thus should only be
+   *                   computed if/when we are sure this JavaScript will
+   *                   be used by the application.
    * @memberOf InputFile
    * @instance
    */
-  addJavaScript(options) {
-    var self = this;
-    if (options.sourceMap && typeof options.sourceMap === 'string') {
-      // XXX remove an anti-XSSI header? ")]}'\n"
-      options.sourceMap = JSON.parse(options.sourceMap);
-    }
-    self._resourceSlot.addJavaScript(options);
+  addJavaScript(options, lazyFinalizer) {
+    this._resourceSlot.addJavaScript(options, lazyFinalizer);
   }
 
   /**
@@ -487,12 +500,24 @@ class InputFile extends buildPluginModule.InputFile {
    * file.
    * @param {String} [options.hash] Optionally, supply a hash for the output
    * file.
+   * @param {Function} lazyFinalizer Optional function that can be called
+   *                   to obtain any remaining options that may be
+   *                   expensive to compute, and thus should only be
+   *                   computed if/when we are sure this asset will be
+   *                   used by the application.
    * @memberOf InputFile
    * @instance
    */
-  addAsset(options) {
-    var self = this;
-    self._resourceSlot.addAsset(options);
+  addAsset(options, lazyFinalizer) {
+    if (typeof lazyFinalizer === "function") {
+      // For now, just call the lazyFinalizer function immediately. Since
+      // assets typically are not compiled, this immediate invocation is
+      // probably permanently appropriate for addAsset, whereas methods
+      // like addJavaScript benefit from waiting to call lazyFinalizer.
+      Object.assign(options, Promise.await(lazyFinalizer()));
+    }
+
+    this._resourceSlot.addAsset(options);
   }
 
   /**
@@ -502,12 +527,24 @@ class InputFile extends buildPluginModule.InputFile {
    * @param {String} options.section Which section of the document should
    * be appended to. Can only be "head" or "body".
    * @param {String} options.data The content to append.
+   * @param {Function} lazyFinalizer Optional function that can be called
+   *                   to obtain any remaining options that may be
+   *                   expensive to compute, and thus should only be
+   *                   computed if/when we are sure this HTML will be used
+   *                   by the application.
    * @memberOf InputFile
    * @instance
    */
   addHtml(options) {
-    var self = this;
-    self._resourceSlot.addHtml(options);
+    if (typeof lazyFinalizer === "function") {
+      // For now, just call the lazyFinalizer function immediately. Since
+      // HTML is not compiled, this immediate invocation is probably
+      // permanently appropriate for addHtml, whereas methods like
+      // addJavaScript benefit from waiting to call lazyFinalizer.
+      Object.assign(options, Promise.await(lazyFinalizer()));
+    }
+
+    this._resourceSlot.addHtml(options);
   }
 
   _reportError(message, info) {
@@ -538,6 +575,8 @@ class ResourceSlot {
     self.outputResources = [];
     // JS, which gets linked together at the end.
     self.jsOutputResources = [];
+    // Errors encountered while processing this resource.
+    self.errors = [];
     self.sourceProcessor = sourceProcessor;
     self.packageSourceBatch = packageSourceBatch;
 
@@ -673,100 +712,72 @@ class ResourceSlot {
     return isInImports;
   }
 
-  addStylesheet(options) {
-    const self = this;
-    if (! self.sourceProcessor) {
+  addStylesheet(options, lazyFinalizer) {
+    if (! this.sourceProcessor) {
       throw Error("addStylesheet on non-source ResourceSlot?");
     }
 
-    const data = files.convertToStandardLineEndings(options.data);
-    const useMeteorInstall = self.packageSourceBatch.useMeteorInstall;
-    const sourcePath = this.inputResource.path;
-    const targetPath = options.path || sourcePath;
-    const resource = {
-      refreshable: true,
-      sourcePath,
-      targetPath,
-      servePath: self.packageSourceBatch.unibuild.pkg._getServePath(targetPath),
-      hash: sha1(data),
-      lazy: this._isLazy(options, false),
-    };
+    // In contrast to addJavaScript, CSS resources passed to addStylesheet
+    // default to being eager (non-lazy).
+    options.lazy = this._isLazy(options, false);
 
-    if (useMeteorInstall && resource.lazy) {
+    if (this.packageSourceBatch.useMeteorInstall &&
+        options.lazy) {
       // If the current packageSourceBatch supports modules, and this CSS
       // file is lazy, add it as a lazy JS module instead of adding it
       // unconditionally as a CSS resource, so that it can be imported
       // when needed.
-      resource.type = "js";
-      resource.data =
-        Buffer.from(cssToCommonJS(data, resource.hash), "utf8");
+      this.addJavaScript(options, async () => {
+        const result = typeof lazyFinalizer === "function"
+          ? await lazyFinalizer()
+          : { data: options.data };
 
-      self.jsOutputResources.push(resource);
+        if (result) {
+          result.data = Buffer.from(cssToCommonJS(result.data), "utf8");
+        }
+
+        return result;
+      });
 
     } else {
       // Eager CSS is added unconditionally to a combined <style> tag at
       // the beginning of the <head>. If the corresponding module ever
       // gets imported, its module.exports object should be an empty stub,
       // rather than a <style> node added dynamically to the <head>.
-      self.jsOutputResources.push({
-        ...resource,
-        type: "js",
+      this.addJavaScript({
+        ...options,
         data: Buffer.from(
           "// These styles have already been applied to the document.\n",
           "utf8"),
+        lazy: true,
         // If a compiler plugin calls addJavaScript with the same
         // sourcePath, that code should take precedence over this empty
-        // stub, so this property marks the resource as disposable.
-        implicit: true,
-        lazy: true,
-      });
+        // stub, so setting .implicit marks the resource as disposable.
+      }).implicit = true;
 
-      resource.type = "css";
-      resource.data = Buffer.from(data, 'utf8'),
-
-      // XXX do we need to call convertSourceMapPaths here like we did
-      //     in legacy handlers?
-      resource.sourceMap = options.sourceMap;
-
-      self.outputResources.push(resource);
+      this.outputResources.push(new CssOutputResource({
+        resourceSlot: this,
+        options,
+        lazyFinalizer,
+      }));
     }
   }
 
-  addJavaScript(options) {
-    const self = this;
+  addJavaScript(options, lazyFinalizer) {
     // #HardcodeJs this gets called by constructor in the "js" case
-    if (! self.sourceProcessor && self.inputResource.extension !== "js") {
+    if (! this.sourceProcessor && this.inputResource.extension !== "js") {
       throw Error("addJavaScript on non-source ResourceSlot?");
     }
 
-    let sourcePath = self.inputResource.path;
-    if (_.has(options, "sourcePath") &&
-        typeof options.sourcePath === "string") {
-      sourcePath = options.sourcePath;
-    }
-
-    const targetPath = options.path || sourcePath;
-
-    var data = Buffer.from(
-      files.convertToStandardLineEndings(options.data), 'utf8');
-
-    self.jsOutputResources.push({
-      type: "js",
-      data: data,
-      sourcePath,
-      targetPath,
-      servePath: self.packageSourceBatch.unibuild.pkg._getServePath(targetPath),
-      // XXX should we allow users to be trusted and specify a hash?
-      hash: sha1(data),
-      // XXX do we need to call convertSourceMapPaths here like we did
-      //     in legacy handlers?
-      sourceMap: options.sourceMap,
-      // intentionally preserve a possible `undefined` value for files
-      // in apps, rather than convert it into `false` via `!!`
-      lazy: self._isLazy(options, true),
-      bare: !! self._getOption("bare", options),
-      mainModule: !! self._getOption("mainModule", options),
+    const resource = new JsOutputResource({
+      resourceSlot: this,
+      options,
+      lazyFinalizer,
     });
+
+    this.jsOutputResources.push(resource);
+
+    return resource;
   }
 
   addAsset(options) {
@@ -821,20 +832,141 @@ class ResourceSlot {
 
   addError(message, info) {
     // If this file is ever actually imported, only then will we report
-    // the error. Use this.jsOutputResources because that's what the
-    // ImportScanner deals with.
-    this.jsOutputResources.push({
-      type: "js",
-      sourcePath: this.inputResource.path,
-      targetPath: this.inputResource.path,
-      servePath: this.inputResource.path,
-      data: Buffer.from(
-        "throw new Error(" + JSON.stringify(message) + ");\n",
-        "utf8"),
-      lazy: true,
-      error: { message, info },
+    // the error.
+    this.errors.push({ message, info });
+  }
+}
+
+class OutputResource {
+  constructor({
+    type,
+    resourceSlot,
+    options = Object.create(null),
+    lazyFinalizer = null,
+  }) {
+    this._lazyFinalizer = lazyFinalizer;
+    this._initialOptions = options;
+    this._finalizerPromise = null;
+    // Share the errors array of the resourceSlot.
+    this._errors = resourceSlot.errors;
+
+    let sourcePath = resourceSlot.inputResource.path;
+    if (_.has(options, "sourcePath") &&
+        typeof options.sourcePath === "string") {
+      sourcePath = options.sourcePath;
+    }
+
+    const targetPath = options.path || sourcePath;
+
+    Object.assign(this, {
+      type,
+      lazy: resourceSlot._isLazy(options, true),
+      bare: !! resourceSlot._getOption("bare", options),
+      mainModule: !! resourceSlot._getOption("mainModule", options),
+      sourcePath,
+      targetPath,
+      servePath: resourceSlot.packageSourceBatch
+        .unibuild.pkg._getServePath(targetPath),
     });
   }
+
+  finalize() {
+    if (this._finalizerPromise) {
+      this._finalizerPromise.await();
+    } else if (this._lazyFinalizer) {
+      const finalize = this._lazyFinalizer;
+      this._lazyFinalizer = null;
+      (this._finalizerPromise = new Promise(
+        resolve => resolve(finalize())
+      ).then(result => {
+        Object.assign(this._initialOptions, result);
+        this._finalizerPromise = null;
+      })).await();
+    }
+  }
+
+  reportPendingErrors() {
+    this.finalize();
+    const count = this._errors.length;
+    if (count > 0) {
+      const firstError = this._errors[0];
+      buildmessage.error(
+        firstError.message,
+        firstError.info
+      );
+    }
+    return count;
+  }
+
+  get data() { return this._get("data"); }
+  set data(value) { return this._set("data", value); }
+
+  get hash() { return this._get("hash"); }
+  set hash(value) { return this._set("hash", value); }
+
+  get sourceMap() { return this._get("sourceMap"); }
+  set sourceMap(value) { return this._set("sourceMap", value); }
+
+  // Method for getting properties that may be computed lazily, or that
+  // require some one-time post-processing.
+  _get(name) {
+    if (hasOwn.call(this, name)) {
+      return this[name];
+    }
+
+    this.finalize();
+
+    switch (name) {
+    case "data":
+      let { data } = this._initialOptions;
+      if (! Buffer.isBuffer(data)) {
+        data = Buffer.from(data, "utf8");
+      }
+      return this._set("data", data);
+
+    case "hash":
+      const { hash } = this._initialOptions;
+      return this._set("hash", hash || sha1(this._get("data")));
+
+    case "sourceMap":
+      let { sourceMap } = this._initialOptions;
+      if (sourceMap && typeof sourceMap === "string") {
+        sourceMap = JSON.parse(sourceMap);
+      }
+      return this._set("sourceMap", sourceMap);
+    }
+
+    if (! hasOwn.call(this._initialOptions, name)) {
+      throw new Error(`Unknown JsOutputResource property: ${name}`);
+    }
+
+    return this[name] = this._initialOptions[name];
+  }
+
+  // This method must be used to set any properties that have a getter
+  // defined above (data, hash, sourceMap).
+  _set(name, value) {
+    Object.defineProperty(this, name, {
+      value,
+      enumerable: true,
+      writable: true,
+      configurable: true,
+    });
+    return value;
+  }
+}
+
+class JsOutputResource extends OutputResource {
+  constructor(options) {
+    super({ ...options, type: "js" });
+  }
+}
+
+class CssOutputResource extends OutputResource {
+  constructor(options) {
+    super({ ...options, type: "css" });
+    this.refreshable = true;
+  }
 }
 
 export class PackageSourceBatch {
@@ -850,7 +982,7 @@ export class PackageSourceBatch {
     self.sourceRoot = sourceRoot;
     self.linkerCacheDir = linkerCacheDir;
     self.importExtensions = [".js", ".json"];
-    self._resolver = null;
+    self._nodeModulesPaths = null;
 
     var sourceProcessorSet = self._getSourceProcessorSet();
 
@@ -943,30 +1075,33 @@ export class PackageSourceBatch {
     }
   }
 
-  getResolver() {
-    if (this._resolver) {
-      return this._resolver;
-    }
-
-    const nmds = this.unibuild.nodeModulesDirectories;
-    const nodeModulesPaths = [];
-
-    _.each(nmds, (nmd, path) => {
-      if (! nmd.local) {
-        nodeModulesPaths.push(
-          files.convertToOSPath(path.replace(/\/$/g, "")));
-      }
-    });
-
-    return this._resolver = Resolver.getOrCreate({
+  getResolver(options = {}) {
+    return Resolver.getOrCreate({
       caller: "PackageSourceBatch#getResolver",
       sourceRoot: this.sourceRoot,
       targetArch: this.processor.arch,
       extensions: this.importExtensions,
-      nodeModulesPaths,
+      nodeModulesPaths: this._getNodeModulesPaths(),
+      ...options,
     });
   }
 
+  _getNodeModulesPaths() {
+    if (! this._nodeModulesPaths) {
+      const nmds = this.unibuild.nodeModulesDirectories;
+      this._nodeModulesPaths = [];
+
+      _.each(nmds, (nmd, path) => {
+        if (! nmd.local) {
+          this._nodeModulesPaths.push(
+            files.convertToOSPath(path.replace(/\/$/g, "")));
+        }
+      });
+    }
+
+    return this._nodeModulesPaths;
+  }
+
   _getSourceProcessorSet() {
     const self = this;
 
@@ -1406,7 +1541,7 @@ export class PackageSourceBatch {
     if (cacheFilename) {
       let diskCached = null;
       try {
-        diskCached = files.readJSONOrNull(cacheFilename);
+        diskCached = optimisticReadJsonOrNull(cacheFilename);
       } catch (e) {
         // Ignore JSON parse errors; pretend there was no cache.
         if (!(e instanceof SyntaxError)) {
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index a38bde4db2..c40383e18d 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -34,11 +34,16 @@ var compiler = exports;
 // dependencies. (At least for now, packages only used in target creation (eg
 // minifiers) don't require you to update BUILT_BY, though you will need to quit
 // and rerun "meteor run".)
-compiler.BUILT_BY = 'meteor/30';
+compiler.BUILT_BY = 'meteor/31';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')
-compiler.ALL_ARCHES = [ "os", "web.browser", "web.cordova" ];
+compiler.ALL_ARCHES = [
+  "os",
+  "web.browser",
+  "web.browser.legacy",
+  "web.cordova"
+];
 
 compiler.compile = Profile(function (packageSource, options) {
   return `compiler.compile(${ packageSource.name || 'the app' })`;
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 4e825eb676..523274d9fe 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -249,19 +249,6 @@ export default class ImportScanner {
       // something plausible. #6411 #6383
       const absPath = pathJoin(this.sourceRoot, file.sourcePath);
 
-      const dotExt = "." + file.type;
-      const dataString = file.data.toString("utf8");
-      file.dataString = defaultExtensionHandlers[dotExt].call(
-        file,
-        dataString,
-        file.hash,
-      );
-
-      if (! (file.data instanceof Buffer) ||
-          file.dataString !== dataString) {
-        file.data = Buffer.from(file.dataString, "utf8");
-      }
-
       // This property can have values false, true, "dynamic" (which
       // indicates that the file has been imported, but only dynamically).
       file.imported = false;
@@ -302,9 +289,10 @@ export default class ImportScanner {
     const files = this.realPathToFiles[realPath];
     if (files && files.length > 0) {
       const firstFile = files[0];
+      const dataString = this._getDataString(firstFile);
       return {
         data: firstFile.data,
-        dataString: firstFile.dataString,
+        dataString: dataString,
         hash: firstFile.hash,
       };
     }
@@ -417,7 +405,7 @@ export default class ImportScanner {
       // plugin calling inputFile.addJavaScript multiple times for the
       // same source file (see discussion in #9176), with different target
       // paths, code, laziness, etc.
-      sourceFile.dataString += [
+      sourceFile.dataString = this._getDataString(sourceFile) + [
         "module.watch(require(" + JSON.stringify(relativeId) + "), {",
         '  "*": module.makeNsSetter(true)',
         "});",
@@ -437,6 +425,8 @@ export default class ImportScanner {
   // maps and updating all other properties appropriately. Once this
   // combination is done, oldFile should be kept and newFile discarded.
   _combineFiles(oldFile, newFile) {
+    const scanner = this;
+
     function checkProperty(name) {
       if (has(oldFile, name)) {
         if (! has(newFile, name)) {
@@ -469,8 +459,11 @@ export default class ImportScanner {
       const consumer = file.sourceMap &&
         new SourceMapConsumer(file.sourceMap);
       const node = consumer &&
-        SourceNode.fromStringWithSourceMap(file.dataString, consumer);
-      return node || file.dataString;
+        SourceNode.fromStringWithSourceMap(
+          scanner._getDataString(file),
+          consumer
+        );
+      return node || scanner._getDataString(file);
     }
 
     const {
@@ -728,7 +721,7 @@ export default class ImportScanner {
     }
 
     const result = findImportedModuleIdentifiers(
-      file.dataString,
+      this._getDataString(file),
       file.hash,
     );
 
@@ -825,14 +818,11 @@ export default class ImportScanner {
     // Set file.imported to a truthy value (either "dynamic" or true).
     file.imported = forDynamicImport ? "dynamic" : true;
 
-    if (file.error) {
+    if (file.reportPendingErrors &&
+        file.reportPendingErrors() > 0) {
       // Any errors reported to InputFile#error were saved but not
       // reported at compilation time. Now that we know the file has been
       // imported, it's time to report those errors.
-      buildmessage.error(
-        file.error.message,
-        file.error.info
-      );
       return;
     }
 
@@ -913,6 +903,27 @@ export default class ImportScanner {
     return archMatches(this.bundleArch, "web.browser");
   }
 
+  _getDataString(file) {
+    if (typeof file.dataString === "string") {
+      return file.dataString;
+    }
+
+    const dotExt = "." + file.type;
+    const dataString = file.data.toString("utf8");
+    file.dataString = defaultExtensionHandlers[dotExt].call(
+      file,
+      dataString,
+      file.hash,
+    );
+
+    if (! (file.data instanceof Buffer) ||
+        file.dataString !== dataString) {
+      file.data = Buffer.from(file.dataString, "utf8");
+    }
+
+    return file.dataString;
+  }
+
   _readFile(absPath) {
     const contents = optimisticReadFile(absPath);
     const hash = optimisticHashOrNull(absPath);
@@ -1385,14 +1396,29 @@ export default class ImportScanner {
   }
 }
 
-each([
-  "_readFile",
+const ISp = ImportScanner.prototype;
+
+[ "_addPkgJsonToOutput",
   "_findImportedModuleIdentifiers",
   "_getAbsModuleId",
-  "_addPkgJsonToOutput",
+  "_readFile",
   "_realPath",
+  "_resolve",
   "_resolvePkgJsonBrowserAliases",
-], funcName => {
-  ImportScanner.prototype[funcName] = Profile(
-    `ImportScanner#${funcName}`, ImportScanner.prototype[funcName]);
+  // We avoid profiling _scanFile here because it doesn't typically have
+  // much "own time," and it gets called recursively, resulting in deeply
+  // nested METEOR_PROFILE output, which often obscures actual problems.
+  // "_scanFile",
+].forEach(name => {
+  ISp[name] = Profile(`ImportScanner#${name}`, ISp[name]);
+});
+
+[ // Include the package name in METEOR_PROFILE output for the following
+  // public methods:
+  "scanImports",
+  "scanMissingModules",
+].forEach(name => {
+  ISp[name] = Profile(function (...args) {
+    return `ImportScanner#${name} for ${this.name || "the app"}`;
+  }, ISp[name]);
 });
diff --git a/tools/isobuild/isopack-cache.js b/tools/isobuild/isopack-cache.js
index f5be165a82..f7c8dbc00c 100644
--- a/tools/isobuild/isopack-cache.js
+++ b/tools/isobuild/isopack-cache.js
@@ -151,20 +151,17 @@ export class IsopackCache {
       return true;
     }
 
-    arch = arch && archinfo.withoutSpecificOs(arch);
+    const unibuild = isopack.getUnibuildAtArch(arch);
+    if (! unibuild) {
+      return false;
+    }
 
-    return _.some(isopack.unibuilds, u => {
-      if (arch && ! archinfo.matches(u.arch, arch)) {
-        return false;
-      }
-
-      return _.some(u.uses, use => {
-        return this.implies(
-          this._isopacks[use.package],
-          name,
-          arch,
-        );
-      });
+    return _.some(unibuild.uses, use => {
+      return this.implies(
+        this._isopacks[use.package],
+        name,
+        arch,
+      );
     });
   }
 
@@ -178,20 +175,17 @@ export class IsopackCache {
       return true;
     }
 
-    arch = arch && archinfo.withoutSpecificOs(arch);
+    const unibuild = isopack.getUnibuildAtArch(arch);
+    if (! unibuild) {
+      return false;
+    }
 
-    return _.some(isopack.unibuilds, u => {
-      if (arch && ! archinfo.matches(u.arch, arch)) {
-        return false;
-      }
-
-      return _.some(u.implies, imp => {
-        return this.implies(
-          this._isopacks[imp.package],
-          name,
-          arch,
-        );
-      });
+    return _.some(unibuild.implies, imp => {
+      return this.implies(
+        this._isopacks[imp.package],
+        name,
+        arch,
+      );
     });
   }
 
diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js
index 553f3e44b7..8cd6d94c86 100644
--- a/tools/isobuild/isopack.js
+++ b/tools/isobuild/isopack.js
@@ -349,9 +349,32 @@ _.extend(Isopack.prototype, {
 
   // A sorted plus-separated string of all the architectures included in this
   // package.
-  buildArchitectures: function () {
-    var self = this;
-    return self.architectures().join('+');
+  buildArchitectures(simplify) {
+    const arches = this.architectures();
+
+    if (simplify) {
+      const simpler = [];
+
+      arches.forEach(arch => {
+        const parts = arch.split(".");
+        while (parts.length > 1) {
+          parts.pop();
+          if (arches.indexOf(parts.join(".")) >= 0) {
+            // If the arches array contains a strict prefix of this arch,
+            // omit this arch from the result, since it should be covered
+            // by the prefix. For example, if arches contains "web" or
+            // "web.browser" then it shouldn't need to contain
+            // "web.browser.legacy" as well.
+            return;
+          }
+        }
+        simpler.push(arch);
+      });
+
+      return simpler.join("+");
+    }
+
+    return arches.join("+");
   },
 
   // Returns true if we think that this isopack is platform specific (contains
@@ -1424,10 +1447,11 @@ _.extend(Isopack.prototype, {
     // Transpile the files we selected
     var babel = require("meteor-babel");
     pathsToTranspile.forEach((path) => {
-      var fullPath = files.convertToOSPath(
-        files.pathJoin(files.getCurrentToolsDir(), path));
-
-      var inputFileContents = files.readFile(fullPath, "utf-8");
+      const toolsDir = files.getCurrentToolsDir();
+      const fullPath = files.convertToOSPath(files.pathJoin(toolsDir, path));
+      let inputFileContents = files.readFile(fullPath, "utf-8");
+      const babelCacheDirectory =
+        files.pathJoin(files.pathDirname(toolsDir), ".babel-cache");
 
       // #RemoveInProd
       // We don't actually want to load the babel auto-transpiler when we are
@@ -1445,10 +1469,12 @@ _.extend(Isopack.prototype, {
       _.extend(babelOptions, {
         filename: path,
         sourceFileName: "/" + path,
-        sourceMap: true
+        sourceMaps: true
       });
 
-      var transpiled = babel.compile(inputFileContents, babelOptions);
+      var transpiled = babel.compile(inputFileContents, babelOptions, {
+        cacheDirectory: babelCacheDirectory,
+      });
 
       var sourceMapUrlComment = "//# sourceMappingURL=" + files.pathBasename(path + ".map");
 
diff --git a/tools/isobuild/package-api.js b/tools/isobuild/package-api.js
index c0f58852d3..6239cfa7c1 100644
--- a/tools/isobuild/package-api.js
+++ b/tools/isobuild/package-api.js
@@ -21,12 +21,18 @@ function toArray (x) {
   return x ? [x] : [];
 }
 
-function toArchArray (arch) {
-  if (! _.isArray(arch)) {
+function toArchArray(arch) {
+  if (! Array.isArray(arch)) {
     arch = arch ? [arch] : compiler.ALL_ARCHES;
   }
-  arch = _.uniq(arch);
-  arch = _.map(arch, mapWhereToArch);
+
+  const seen = Object.create(null);
+
+  arch.splice(0).forEach(where => {
+    if (seen[where]) return;
+    seen[where] = true;
+    arch.push(...mapWhereToArches(where));
+  });
 
   // avoid using _.each so as to not add more frames to skip
   for (var i = 0; i < arch.length; ++i) {
@@ -44,27 +50,42 @@ function toArchArray (arch) {
   return arch;
 }
 
-// We currently have a 1 to 1 mapping between 'where' and 'arch'.
-// 'client' -> 'web'
-// 'server' -> 'os'
-// '*' -> '*'
-export function mapWhereToArch(where) {
-  if (where === 'server') {
-    return 'os';
-  } else if (where === 'client') {
-    return 'web';
+export function mapWhereToArches(where) {
+  const arches = [];
+
+  // Shorthands for common arch prefixes:
+  // "server" => os.*
+  // "client" => web.*
+  // "legacy" => web.browser.legacy, web.cordova
+  if (where === "server") {
+    arches.push("os");
+  } else if (where === "client") {
+    arches.push("web");
+  } else if (where === "legacy") {
+    arches.push(
+      "web.browser.legacy",
+      // It's important to include web.browser.legacy resources in the
+      // Cordova bundle, since Cordova bundles are built into the mobile
+      // application, rather than being downloaded from a web server at
+      // runtime. This means we can't distinguish between clients at
+      // runtime, so we have to use code that works for all clients.
+      "web.cordova"
+    );
   } else {
-    return where;
+    arches.push(where);
   }
+
+  return arches;
 }
 
 // Iterates over the list of target archs and calls f(arch) for all archs
 // that match an element of self.allarchs.
 function forAllMatchingArchs (archs, f) {
-  _.each(archs, function (arch) {
-    _.each(compiler.ALL_ARCHES, function (matchArch) {
+  compiler.ALL_ARCHES.forEach(matchArch => {
+    archs.some(arch => {
       if (archinfo.matches(matchArch, arch)) {
         f(matchArch);
+        return true;
       }
     });
   });
@@ -78,44 +99,41 @@ function forAllMatchingArchs (archs, f) {
  * @global
  * @summary Type of the API object passed into the `Package.onUse` function.
  */
-export function PackageAPI(options) {
-  var self = this;
-  assert.ok(self instanceof PackageAPI);
+export class PackageAPI {
+  constructor(options) {
+    options = options || {};
 
-  options = options || {};
+    this.buildingIsopackets = !!options.buildingIsopackets;
 
-  self.buildingIsopackets = !!options.buildingIsopackets;
+    // source files used.
+    // It's a multi-level map structured as:
+    //   arch -> sources|assets -> relPath -> {relPath, fileOptions}
+    this.files = {};
 
-  // source files used.
-  // It's a multi-level map structured as:
-  //   arch -> sources|assets -> relPath -> {relPath, fileOptions}
-  self.files = {};
+    // symbols exported
+    this.exports = {};
 
-  // symbols exported
-  self.exports = {};
+    // packages used and implied (keys are 'package', 'unordered', and
+    // 'weak').  an "implied" package is a package that will be used by a unibuild
+    // which uses us.
+    this.uses = {};
+    this.implies = {};
 
-  // packages used and implied (keys are 'package', 'unordered', and
-  // 'weak').  an "implied" package is a package that will be used by a unibuild
-  // which uses us.
-  self.uses = {};
-  self.implies = {};
+    _.each(compiler.ALL_ARCHES, arch => {
+      this.files[arch] = {
+        assets: [],
+        sources: [],
+        main: null,
+      };
 
-  _.each(compiler.ALL_ARCHES, function (arch) {
-    self.files[arch] = {
-      assets: [],
-      sources: [],
-      main: null,
-    };
+      this.exports[arch] = [];
+      this.uses[arch] = [];
+      this.implies[arch] = [];
+    });
 
-    self.exports[arch] = [];
-    self.uses[arch] = [];
-    self.implies[arch] = [];
-  });
+    this.releaseRecords = [];
+  }
 
-  self.releaseRecords = [];
-}
-
-_.extend(PackageAPI.prototype, {
   // Called when this package wants to make another package be
   // used. Can also take literal package objects, if you have
   // anonymous packages you want to use (eg, app packages)
@@ -183,7 +201,7 @@ _.extend(PackageAPI.prototype, {
    * are loaded before your package.) You can use this option to break
    * circular dependencies.
    */
-  use: function (names, arch, options) {
+  use(names, arch, options) {
     var self = this;
 
     // Support `api.use(package, {weak: true})` without arch.
@@ -231,7 +249,7 @@ _.extend(PackageAPI.prototype, {
         });
       });
     }
-  },
+  }
 
   // Called when this package wants packages using it to also use
   // another package.  eg, for umbrella packages which want packages
@@ -254,7 +272,7 @@ _.extend(PackageAPI.prototype, {
    * architectures by passing in an array, for example `['web.cordova',
    * 'os.linux']`.
    */
-  imply: function (names, arch) {
+  imply(names, arch) {
     var self = this;
 
     // We currently disallow build plugins in
@@ -306,7 +324,7 @@ _.extend(PackageAPI.prototype, {
         });
       });
     }
-  },
+  }
 
   // Top-level call to add a source file to a package. It will
   // be processed according to its extension (eg, *.coffee
@@ -332,7 +350,7 @@ _.extend(PackageAPI.prototype, {
    * resulting file in a closure. Has the same effect as putting a file into the
    * `client/compatibility` directory in an app.
    */
-  addFiles: function (paths, arch, fileOptions) {
+  addFiles(paths, arch, fileOptions) {
     if (fileOptions && fileOptions.isAsset) {
       // XXX it would be great to print a warning here, see the issue:
       // https://github.com/meteor/meteor/issues/5495
@@ -343,7 +361,7 @@ _.extend(PackageAPI.prototype, {
     // Watch out - we rely on the levels of stack traces inside this
     // function so don't wrap it in another function without changing that logic
     this._addFiles("sources", paths, arch, fileOptions);
-  },
+  }
 
   mainModule(path, arch, fileOptions = {}) {
     arch = toArchArray(arch);
@@ -363,6 +381,15 @@ _.extend(PackageAPI.prototype, {
         // It's not an error to call api.mainModule multiple times, but
         // the last call takes precedence over the earlier calls.
         oldMain.fileOptions.mainModule = false;
+
+        if (! _.has(oldMain.fileOptions, "lazy")) {
+          // If the laziness of the old main module was not explicitly
+          // specified, then it would have been implicitly eager just
+          // because it was the main module. Since we are revoking its
+          // status as main module now, we should also explicitly revoke
+          // the eagerness that came with that status.
+          oldMain.fileOptions.lazy = true;
+        }
       }
 
       filesForArch.main = source;
@@ -370,7 +397,7 @@ _.extend(PackageAPI.prototype, {
 
       this._forbidExportWithLazyMain(a);
     });
-  },
+  }
 
   _forbidExportWithLazyMain(arch) {
     const filesForArch = this.files[arch];
@@ -382,7 +409,7 @@ _.extend(PackageAPI.prototype, {
           "export symbols and have a lazy main module"
       );
     }
-  },
+  }
 
   /**
    * @memberOf PackageAPI
@@ -409,7 +436,7 @@ _.extend(PackageAPI.prototype, {
     // Watch out - we rely on the levels of stack traces inside this
     // function so don't wrap it in another function without changing that logic
     this._addFiles("assets", paths, arch);
-  },
+  }
 
   /**
    * Internal method used by addFiles and addAssets.
@@ -446,7 +473,7 @@ _.extend(PackageAPI.prototype, {
         const filesOfType = self.files[a][type];
 
         // Check if we have already added a file at this path
-        if (_.has(filesOfType, path)) {
+        if (filesOfType.some(source => source.relPath === path)) {
           // We want the singular form of the file type
           const typeName = {
             sources: 'source',
@@ -476,7 +503,7 @@ _.extend(PackageAPI.prototype, {
     for (var i = 0; i < errors.length; ++i) {
       buildmessage.error(errors[i], { useMyCaller: 1 });
     }
-  },
+  }
 
   // Use this release to resolve unclear dependencies for this package. If
   // you don't fill in dependencies for some of your implies/uses, we will
@@ -502,7 +529,7 @@ _.extend(PackageAPI.prototype, {
    * track@version. Just 'version' (e.g. `"0.9.0"`) is sufficient if using the
    * default release track `METEOR`. Can be an array of specifications.
    */
-  versionsFrom: function (releases) {
+  versionsFrom(releases) {
     var self = this;
 
     // Packages in isopackets really ought to be in the core release, by
@@ -545,7 +572,7 @@ _.extend(PackageAPI.prototype, {
         self.releaseRecords.push(releaseRecord);
       }
     }
-  },
+  }
 
   // Export symbols from this package.
   //
@@ -579,7 +606,7 @@ _.extend(PackageAPI.prototype, {
    * @param {Boolean} exportOptions.testOnly If true, this symbol will only be
    * exported when running tests for this package.
    */
-  export: function (symbols, arch, options) {
+  "export"(symbols, arch, options) {
     var self = this;
 
     // Support `api.export("FooTest", {testOnly: true})` without
@@ -612,7 +639,7 @@ _.extend(PackageAPI.prototype, {
       });
     });
   }
-});
+}
 
 // XXX COMPAT WITH 0.8.x
 PackageAPI.prototype.add_files = PackageAPI.prototype.addFiles;
diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index 18a39c3322..4912e71993 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -889,6 +889,7 @@ _.extend(PackageSource.prototype, {
             sourceArch: this,
             ignoreFiles,
             isApp: true,
+            testModule,
           };
 
           // If this architecture has a mainModule defined in
@@ -1025,8 +1026,9 @@ _.extend(PackageSource.prototype, {
         return fileOptions;
       }
 
-      // Files in `imports/` should be lazily loaded *apart* from tests
-      if (dir === "imports" && ! isTestFile) {
+      // Files in `imports/` and `tests/` directories should be lazily
+      // loaded *apart* from tests.
+      if ((dir === "imports" || dir === "tests") && ! isTestFile) {
         fileOptions.lazy = true;
       }
 
@@ -1080,6 +1082,7 @@ _.extend(PackageSource.prototype, {
     watchSet,
     isApp,
     sourceArch,
+    testModule,
     loopChecker = new SymlinkLoopChecker(this.sourceRoot),
     ignoreFiles = []
   }) {
@@ -1102,10 +1105,10 @@ _.extend(PackageSource.prototype, {
     // Unless we're running tests, ignore all test filenames and if we are, ignore the
     // type of file we *aren't* running
     if (!global.testCommandMetadata || global.testCommandMetadata.isTest) {
-      Array.prototype.push.apply(sourceReadOptions.exclude, APP_TEST_FILENAME_REGEXPS);
+      sourceReadOptions.exclude.push(...APP_TEST_FILENAME_REGEXPS);
     }
     if (!global.testCommandMetadata || global.testCommandMetadata.isAppTest) {
-      Array.prototype.push.apply(sourceReadOptions.exclude, TEST_FILENAME_REGEXPS);
+      sourceReadOptions.exclude.push(...TEST_FILENAME_REGEXPS);
     }
 
     // Read top-level source files, excluding control files that were not
@@ -1116,13 +1119,21 @@ _.extend(PackageSource.prototype, {
       controlFiles.push('package.js');
     }
 
-    const anyLevelExcludes = [
-      /^tests\/$/,
+    const anyLevelExcludes = [];
+
+    // If we have a meteor.testModule from package.json, then we don't
+    // need to exclude tests/ directories from the search, because we
+    // trust meteor.testModule to identify a single test entry point.
+    if (! testModule) {
+      anyLevelExcludes.push(/^tests\/$/);
+    }
+
+    anyLevelExcludes.push(
       archinfo.matches(arch, "os")
         ? /^client\/$/
         : /^server\/$/,
       ...sourceReadOptions.exclude,
-    ];
+    );
 
     const topLevelExcludes = isApp ? [
       ...anyLevelExcludes,
diff --git a/tools/packaging/catalog/catalog-remote.js b/tools/packaging/catalog/catalog-remote.js
index 9605556ef6..7ed5aa10c1 100644
--- a/tools/packaging/catalog/catalog-remote.js
+++ b/tools/packaging/catalog/catalog-remote.js
@@ -16,6 +16,13 @@ var Profile = require('../../tool-env/profile.js').Profile;
 // XXX: Rationalize these flags.  Maybe use the logger?
 var DEBUG_SQL = !!process.env.METEOR_DEBUG_SQL;
 
+// Developers using Windows Subsystem for Linux (WSL) may want to override
+// this environment variable to TRUNCATE instead of WAL. WAL mode copes
+// better with (multi-process) concurrency but is currently incompatible
+// with WSL: https://github.com/meteor/meteor-feature-requests/issues/154
+const JOURNAL_MODE =
+  process.env.METEOR_SQLITE_JOURNAL_MODE || "WAL";
+
 var SYNCTOKEN_ID = "1";
 
 var METADATA_LAST_SYNC = "lastsync";
@@ -139,17 +146,8 @@ var Db = function (dbFile, options) {
     return self.open(dbFile);
   });
 
-  // WAL mode copes much better with (multi-process) concurrency
-  // Windows Subsystem for Linux cannot work with WAL mode
-  // https://github.com/meteor/meteor-feature-requests/issues/154
-  // So if any of the filesystems are a windows filesystem (e.g. WSL)
-  // Then we will run with TRUNCATE mode.
   self._retry(function () {
-    if(files.isWindowsLikeFilesystem()) {
-      self._execute('PRAGMA journal_mode=TRUNCATE');
-    } else {
-      self._execute('PRAGMA journal_mode=WAL');
-    }
+    self._execute(`PRAGMA journal_mode=${JOURNAL_MODE}`);
   });
 };
 
@@ -249,9 +247,9 @@ _.extend(Db.prototype, {
       } catch (err) {
         var retry = false;
         // Grr... doesn't expose error code; must string-match
-        if (err.message
-            && (   err.message == "SQLITE_BUSY: database is locked"
-                || err.message == "SQLITE_BUSY: cannot commit transaction - SQL statements in progress")) {
+        if (err.message &&
+            (err.message === "SQLITE_BUSY: database is locked" ||
+             err.message === "SQLITE_BUSY: cannot commit transaction - SQL statements in progress")) {
           if (attempt < BUSY_RETRY_ATTEMPTS) {
             retry = true;
           }
diff --git a/tools/project-context.js b/tools/project-context.js
index 6cc2944f58..e658de9901 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -23,7 +23,7 @@ import {
 } from "./fs/optimistic.js";
 
 import {
-  mapWhereToArch,
+  mapWhereToArches,
 } from "./isobuild/package-api.js";
 
 import Resolver from "./isobuild/resolver.js";
@@ -1299,7 +1299,10 @@ _.extend(exports.PlatformList.prototype, {
 
   getWebArchs: function () {
     var self = this;
-    var archs = [ "web.browser" ];
+    var archs = [
+      "web.browser",
+      "web.browser.legacy",
+    ];
     if (self.usesCordova()) {
       archs.push("web.cordova");
     }
@@ -1677,11 +1680,14 @@ export class MeteorConfig {
       // value as the entry module for all architectures.
       entryModulesByArch["os"] = configEntryModule;
       entryModulesByArch["web"] = configEntryModule;
-    } else if (configEntryModule && typeof configEntryModule === "object") {
+    } else if (configEntryModule &&
+               typeof configEntryModule === "object") {
       // If the top-level config value is an object, use its properties to
       // select an entry module for each architecture.
       Object.keys(configEntryModule).forEach(where => {
-        entryModulesByArch[mapWhereToArch(where)] = configEntryModule[where];
+        mapWhereToArches(where).forEach(arch => {
+          entryModulesByArch[arch] = configEntryModule[where];
+        });
       });
     }
 
@@ -1729,6 +1735,17 @@ export class MeteorConfig {
       if (res && typeof res === "object") {
         return files.pathRelative(this.appDirectory, res.path);
       }
+
+      buildmessage.error(
+        `Could not resolve meteor.mainModule ${
+          JSON.stringify(entryModule)
+        } in ${
+          files.pathRelative(
+            this.appDirectory,
+            this.packageJsonPath
+          )
+        } (${arch})`
+      );
     }
   }
 }
diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 265277ed70..9f888c858c 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -585,21 +585,24 @@ var launchMongo = function (options) {
   var initiateReplSetAndWaitForReady = function () {
     try {
       // Load mongo so we'll be able to talk to it.
-      const { Db, Server } = loadIsopackage('npm-mongo').NpmModuleMongodb;
+      const {
+        MongoClient,
+        Server
+      } = loadIsopackage('npm-mongo').NpmModuleMongodb;
 
       // Connect to the intended primary and start a replset.
-      var db = new Db(
-        'meteor',
+      const client = new MongoClient(
         new Server('127.0.0.1', options.port, {
           poolSize: 1,
           socketOptions: {
             connectTimeoutMS: 60000
           }
-        }),
-        { safe: true }
+        })
       );
 
-      yieldingMethod(db, 'open');
+      yieldingMethod(client, 'connect');
+      const db = client.db('meteor');
+
       if (stopped) {
         return;
       }
@@ -711,7 +714,7 @@ var launchMongo = function (options) {
         break;
       }
 
-      db.close(true /* means "the app is closing the connection" */);
+      client.close(true /* means "the app is closing the connection" */);
     } catch (e) {
       // If the process has exited, we're doing another form of error
       // handling. No need to throw random low-level errors farther.
diff --git a/tools/static-assets/skel-bare/package.json b/tools/static-assets/skel-bare/package.json
index e0a9ae0bb0..8130f4fbb0 100644
--- a/tools/static-assets/skel-bare/package.json
+++ b/tools/static-assets/skel-bare/package.json
@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "@babel/runtime": "^7.0.0-beta.51",
+    "meteor-node-stubs": "^0.4.1"
   }
 }
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
index 9eda04311f..22e35ceded 100644
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -6,8 +6,8 @@
     "test": "meteor test --once --driver-package meteortesting:mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "@babel/runtime": "^7.0.0-beta.51",
+    "meteor-node-stubs": "^0.4.1"
   },
   "devDependencies": {
     "chai": "^4.1.2"
diff --git a/tools/static-assets/skel-minimal/.gitignore b/tools/static-assets/skel-minimal/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/static-assets/skel-minimal/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/static-assets/skel-minimal/.meteor/.gitignore b/tools/static-assets/skel-minimal/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/static-assets/skel-minimal/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/static-assets/skel-minimal/.meteor/packages b/tools/static-assets/skel-minimal/.meteor/packages
new file mode 100644
index 0000000000..341bbfc93a
--- /dev/null
+++ b/tools/static-assets/skel-minimal/.meteor/packages
@@ -0,0 +1,15 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor                  # Shared foundation for all Meteor packages
+static-html             # Define static page content in .html files
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+webapp                  # Serves a Meteor app over HTTP
+server-render           # Support for server-side rendering
diff --git a/tools/static-assets/skel-minimal/.meteor/platforms b/tools/static-assets/skel-minimal/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/static-assets/skel-minimal/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/static-assets/skel-minimal/client/main.css b/tools/static-assets/skel-minimal/client/main.css
new file mode 100644
index 0000000000..7f354f0fa7
--- /dev/null
+++ b/tools/static-assets/skel-minimal/client/main.css
@@ -0,0 +1,4 @@
+body {
+  padding: 10px;
+  font-family: sans-serif;
+}
diff --git a/tools/static-assets/skel-minimal/client/main.html b/tools/static-assets/skel-minimal/client/main.html
new file mode 100644
index 0000000000..19789db4de
--- /dev/null
+++ b/tools/static-assets/skel-minimal/client/main.html
@@ -0,0 +1,21 @@
+<head>
+  <title>Minimal Meteor app</title>
+</head>
+
+<body>
+  <h1>Minimal Meteor app</h1>
+  <p>
+    This Meteor app uses as few Meteor packages as possible, to keep the
+    client JavaScript bundle as small as possible.
+  </p>
+
+  <em id="server-render-target"></em>
+
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li><a href="https://www.meteor.com/try" target="_blank">Do the Tutorial</a></li>
+    <li><a href="http://guide.meteor.com" target="_blank">Follow the Guide</a></li>
+    <li><a href="https://docs.meteor.com" target="_blank">Read the Docs</a></li>
+    <li><a href="https://forums.meteor.com" target="_blank">Discussions</a></li>
+  </ul>
+</body>
diff --git a/tools/static-assets/skel-minimal/client/main.js b/tools/static-assets/skel-minimal/client/main.js
new file mode 100644
index 0000000000..ef66448599
--- /dev/null
+++ b/tools/static-assets/skel-minimal/client/main.js
@@ -0,0 +1 @@
+console.log(`Greetings from ${module.id}!`);
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
new file mode 100644
index 0000000000..c6f65ba737
--- /dev/null
+++ b/tools/static-assets/skel-minimal/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "~name~",
+  "private": true,
+  "scripts": {
+    "start": "meteor run",
+    "test": "meteor test --once --driver-package meteortesting:mocha",
+    "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
+    "visualize": "meteor --production --extra-packages bundle-visualizer"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.0.0-beta.51",
+    "meteor-node-stubs": "^0.4.1"
+  },
+  "meteor": {
+    "mainModule": {
+      "client": "client/main.js",
+      "server": "server/main.js"
+    },
+    "testModule": "tests/main.js"
+  }
+}
diff --git a/tools/static-assets/skel-minimal/server/main.js b/tools/static-assets/skel-minimal/server/main.js
new file mode 100644
index 0000000000..f633921e0e
--- /dev/null
+++ b/tools/static-assets/skel-minimal/server/main.js
@@ -0,0 +1,15 @@
+import { Meteor } from "meteor/meteor";
+import { onPageLoad } from "meteor/server-render";
+
+Meteor.startup(() => {
+  // Code to run on server startup.
+  console.log(`Greetings from ${module.id}!`);
+});
+
+onPageLoad(sink => {
+  // Code to run on every request.
+  sink.renderIntoElementById(
+    "server-render-target",
+    `Server time: ${new Date}`
+  );
+});
diff --git a/tools/static-assets/skel/test/main.js b/tools/static-assets/skel-minimal/tests/main.js
similarity index 100%
rename from tools/static-assets/skel/test/main.js
rename to tools/static-assets/skel-minimal/tests/main.js
diff --git a/tools/static-assets/skel/client/main.css b/tools/static-assets/skel/client/main.css
index b6b4052b43..7f354f0fa7 100644
--- a/tools/static-assets/skel/client/main.css
+++ b/tools/static-assets/skel/client/main.css
@@ -1 +1,4 @@
-/* CSS declarations go here */
+body {
+  padding: 10px;
+  font-family: sans-serif;
+}
diff --git a/tools/static-assets/skel/package.json b/tools/static-assets/skel/package.json
index 1b057225ab..c6f65ba737 100644
--- a/tools/static-assets/skel/package.json
+++ b/tools/static-assets/skel/package.json
@@ -8,14 +8,14 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "@babel/runtime": "^7.0.0-beta.51",
+    "meteor-node-stubs": "^0.4.1"
   },
   "meteor": {
     "mainModule": {
       "client": "client/main.js",
       "server": "server/main.js"
     },
-    "testModule": "test/main.js"
+    "testModule": "tests/main.js"
   }
 }
diff --git a/tools/static-assets/skel/tests/main.js b/tools/static-assets/skel/tests/main.js
new file mode 100644
index 0000000000..ea7a8da1e1
--- /dev/null
+++ b/tools/static-assets/skel/tests/main.js
@@ -0,0 +1,20 @@
+import assert from "assert";
+
+describe("~name~", function () {
+  it("package.json has correct name", async function () {
+    const { name } = await import("../package.json");
+    assert.strictEqual(name, "~name~");
+  });
+
+  if (Meteor.isClient) {
+    it("client is not server", function () {
+      assert.strictEqual(Meteor.isServer, false);
+    });
+  }
+
+  if (Meteor.isServer) {
+    it("server is not client", function () {
+      assert.strictEqual(Meteor.isClient, false);
+    });
+  }
+});
diff --git a/tools/tests/app-config.js b/tools/tests/app-config.js
index 34913436d7..17dd260b8e 100644
--- a/tools/tests/app-config.js
+++ b/tools/tests/app-config.js
@@ -15,15 +15,15 @@ selftest.define("mainModule", function () {
   run.waitSecs(60);
   run.match("App running at");
 
-  function check(mainModule) {
-    writeConfig(s, run, mainModule);
+  function check(mainModule, errorPattern) {
+    writeConfig(s, run, mainModule, errorPattern);
   }
 
   check();
 
   check(null);
 
-  check("oyez");
+  check("oyez", /Could not resolve meteor.mainModule/);
 
   check({});
 
@@ -112,7 +112,7 @@ selftest.define("mainModule", function () {
   run.stop();
 });
 
-function writeConfig(s, run, mainModule) {
+function writeConfig(s, run, mainModule, errorPattern) {
   const json = JSON.parse(s.read("package.json"));
 
   json.meteor = {
@@ -129,9 +129,14 @@ function writeConfig(s, run, mainModule) {
   s.write("package.json", JSON.stringify(json, null, 2) + "\n");
 
   run.waitSecs(10);
-  run.forbid(" 0 passing ");
-  run.match("SERVER FAILURES: 0");
-  run.match("CLIENT FAILURES: 0");
+
+  if (errorPattern instanceof RegExp) {
+    run.match(errorPattern);
+  } else {
+    run.forbid(" 0 passing ");
+    run.match("SERVER FAILURES: 0");
+    run.match("CLIENT FAILURES: 0");
+  }
 }
 
 selftest.define("testModule", function () {
diff --git a/tools/tests/apps/app-config/package-lock.json b/tools/tests/apps/app-config/package-lock.json
index 454189368e..91548511ae 100644
--- a/tools/tests/apps/app-config/package-lock.json
+++ b/tools/tests/apps/app-config/package-lock.json
@@ -8,19 +8,19 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz",
       "integrity": "sha512-/3a3USMKk54BEHhDgY8rtxtaQOs4bp4aQwo6SDtdwmrXmgSgEusWuXNX5oIs/nwzmTD9o8wz2EyAjA+uHDMmJA==",
       "requires": {
-        "core-js": "2.5.5",
+        "core-js": "2.5.6",
         "regenerator-runtime": "0.11.1"
       }
     },
     "core-js": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz",
-      "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz",
+      "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ=="
     },
     "meteor-node-stubs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz",
-      "integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
+      "integrity": "sha512-UO2OStvLOKoApmOdIP5eCqoLaa/ritMXRg4ffJVdkNLEsczzPvTjgC0Mxk4cM4R8MZkwll90FYgjDf5qUTJdMA==",
       "requires": {
         "assert": "1.4.1",
         "browserify-zlib": "0.1.4",
@@ -36,10 +36,10 @@
         "process": "0.11.10",
         "punycode": "1.4.1",
         "querystring-es3": "0.2.1",
-        "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+        "readable-stream": "2.3.6",
         "stream-browserify": "2.0.1",
-        "stream-http": "2.8.0",
-        "string_decoder": "1.1.0",
+        "stream-http": "2.8.1",
+        "string_decoder": "1.1.1",
         "timers-browserify": "1.4.2",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
@@ -49,78 +49,56 @@
       "dependencies": {
         "asn1.js": {
           "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           }
         },
         "assert": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-          "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+          "bundled": true,
           "requires": {
             "util": "0.10.3"
           }
         },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
         "base64-js": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-          "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
+          "version": "1.3.0",
+          "bundled": true
         },
         "bn.js": {
           "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
+          "bundled": true
         },
         "brorand": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+          "bundled": true
         },
         "browserify-aes": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-          "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
             "buffer-xor": "1.0.3",
             "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
+            "create-hash": "1.2.0",
             "evp_bytestokey": "1.0.3",
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "browserify-cipher": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-          "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "browserify-aes": "1.1.1",
-            "browserify-des": "1.0.0",
+            "browserify-aes": "1.2.0",
+            "browserify-des": "1.0.1",
             "evp_bytestokey": "1.0.3"
           }
         },
         "browserify-des": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-          "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
             "des.js": "1.0.0",
@@ -129,8 +107,7 @@
         },
         "browserify-rsa": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-          "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "randombytes": "2.0.6"
@@ -138,142 +115,127 @@
         },
         "browserify-sign": {
           "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-          "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
             "elliptic": "6.4.0",
             "inherits": "2.0.1",
-            "parse-asn1": "5.1.0"
+            "parse-asn1": "5.1.1"
           }
         },
         "browserify-zlib": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+          "bundled": true,
           "requires": {
             "pako": "0.2.9"
           }
         },
         "buffer": {
           "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+          "bundled": true,
           "requires": {
-            "base64-js": "1.2.3",
-            "ieee754": "1.1.8",
+            "base64-js": "1.3.0",
+            "ieee754": "1.1.11",
             "isarray": "1.0.0"
           }
         },
         "buffer-xor": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+          "bundled": true
         },
         "builtin-status-codes": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+          "bundled": true
         },
         "cipher-base": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
         "console-browserify": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-          "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+          "bundled": true,
           "requires": {
             "date-now": "0.1.4"
           }
         },
         "constants-browserify": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
         },
         "create-ecdh": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-          "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+          "version": "4.0.3",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "elliptic": "6.4.0"
           }
         },
         "create-hash": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-          "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
             "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "sha.js": "2.4.10"
+            "md5.js": "1.3.4",
+            "ripemd160": "2.0.2",
+            "sha.js": "2.4.11"
           }
         },
         "create-hmac": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-          "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+          "version": "1.1.7",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
+            "create-hash": "1.2.0",
             "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "ripemd160": "2.0.2",
+            "safe-buffer": "5.1.2",
+            "sha.js": "2.4.11"
           }
         },
         "crypto-browserify": {
           "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-          "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+          "bundled": true,
           "requires": {
-            "browserify-cipher": "1.0.0",
+            "browserify-cipher": "1.0.1",
             "browserify-sign": "4.0.4",
-            "create-ecdh": "4.0.0",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "diffie-hellman": "5.0.2",
+            "create-ecdh": "4.0.3",
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
+            "diffie-hellman": "5.0.3",
             "inherits": "2.0.1",
-            "pbkdf2": "3.0.14",
-            "public-encrypt": "4.0.0",
+            "pbkdf2": "3.0.16",
+            "public-encrypt": "4.0.2",
             "randombytes": "2.0.6",
             "randomfill": "1.0.4"
           }
         },
         "date-now": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+          "bundled": true
         },
         "des.js": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-          "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           }
         },
         "diffie-hellman": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-          "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+          "version": "5.0.3",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "miller-rabin": "4.0.1",
@@ -282,376 +244,271 @@
         },
         "domain-browser": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+          "bundled": true
         },
         "elliptic": {
           "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-          "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "brorand": "1.1.0",
             "hash.js": "1.1.3",
             "hmac-drbg": "1.0.1",
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0",
+            "minimalistic-assert": "1.0.1",
             "minimalistic-crypto-utils": "1.0.1"
           }
         },
         "events": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+          "bundled": true
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+          "bundled": true,
           "requires": {
             "md5.js": "1.3.4",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.1",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "hash-base": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-          "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+          "version": "3.0.4",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1"
+            "inherits": "2.0.1",
+            "safe-buffer": "5.1.2"
           }
         },
         "hash.js": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-          "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.3",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
         "hmac-drbg": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+          "bundled": true,
           "requires": {
             "hash.js": "1.1.3",
-            "minimalistic-assert": "1.0.0",
+            "minimalistic-assert": "1.0.1",
             "minimalistic-crypto-utils": "1.0.1"
           }
         },
         "https-browserify": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI="
+          "bundled": true
         },
         "ieee754": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+          "version": "1.1.11",
+          "bundled": true
         },
         "indexof": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-          "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "inherits": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "bundled": true
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "bundled": true
         },
         "md5.js": {
           "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-          "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+          "bundled": true,
           "requires": {
             "hash-base": "3.0.4",
             "inherits": "2.0.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-              "requires": {
-                "inherits": "2.0.1",
-                "safe-buffer": "5.1.1"
-              }
-            }
           }
         },
         "miller-rabin": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "brorand": "1.1.0"
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-          "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
+          "version": "1.0.1",
+          "bundled": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "os-browserify": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8="
+          "bundled": true
         },
         "pako": {
           "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+          "bundled": true
         },
         "parse-asn1": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-          "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+          "version": "5.1.1",
+          "bundled": true,
           "requires": {
             "asn1.js": "4.10.1",
-            "browserify-aes": "1.1.1",
-            "create-hash": "1.1.3",
+            "browserify-aes": "1.2.0",
+            "create-hash": "1.2.0",
             "evp_bytestokey": "1.0.3",
-            "pbkdf2": "3.0.14"
+            "pbkdf2": "3.0.16"
           }
         },
         "path-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-          "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+          "bundled": true
         },
         "pbkdf2": {
-          "version": "3.0.14",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-          "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+          "version": "3.0.16",
+          "bundled": true,
           "requires": {
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
+            "ripemd160": "2.0.2",
+            "safe-buffer": "5.1.2",
+            "sha.js": "2.4.11"
           }
         },
         "process": {
           "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+          "bundled": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "bundled": true
         },
         "public-encrypt": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-          "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+          "version": "4.0.2",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "parse-asn1": "5.1.0",
+            "create-hash": "1.2.0",
+            "parse-asn1": "5.1.1",
             "randombytes": "2.0.6"
           }
         },
         "punycode": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "bundled": true
         },
         "querystring": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+          "bundled": true
         },
         "querystring-es3": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+          "bundled": true
         },
         "randombytes": {
           "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-          "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "randomfill": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+          "bundled": true,
           "requires": {
             "randombytes": "2.0.6",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "readable-stream": {
-          "version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+          "version": "2.3.6",
+          "bundled": true,
           "requires": {
+            "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
         "ripemd160": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-          "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+          "version": "2.0.2",
+          "bundled": true,
           "requires": {
-            "hash-base": "2.0.2",
+            "hash-base": "3.0.4",
             "inherits": "2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "version": "5.1.2",
+          "bundled": true
         },
         "sha.js": {
-          "version": "2.4.10",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-          "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+          "version": "2.4.11",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "stream-browserify": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-          "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12"
+            "readable-stream": "2.3.6"
           }
         },
         "stream-http": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
-          "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
+          "version": "2.8.1",
+          "bundled": true,
           "requires": {
             "builtin-status-codes": "3.0.0",
             "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+            "readable-stream": "2.3.6",
             "to-arraybuffer": "1.0.1",
             "xtend": "4.0.1"
           }
         },
         "string_decoder": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
-          "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
+          "version": "1.1.1",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "timers-browserify": {
           "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+          "bundled": true,
           "requires": {
             "process": "0.11.10"
           }
         },
         "to-arraybuffer": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+          "bundled": true
         },
         "tty-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+          "bundled": true
         },
         "url": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "bundled": true,
           "requires": {
             "punycode": "1.3.2",
             "querystring": "0.2.0"
@@ -659,41 +516,31 @@
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+              "bundled": true
             }
           }
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+          "bundled": true
         },
         "vm-browserify": {
           "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+          "bundled": true,
           "requires": {
             "indexof": "0.0.1"
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
         "xtend": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+          "bundled": true
         }
       }
     },
diff --git a/tools/tests/apps/app-config/package.json b/tools/tests/apps/app-config/package.json
index 1c175061c8..cfb1761b5a 100644
--- a/tools/tests/apps/app-config/package.json
+++ b/tools/tests/apps/app-config/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "meteor-node-stubs": "^0.4.1"
   },
   "meteor": {
     "testModule": "tests.js"
diff --git a/tools/tests/apps/caching-stylus/.meteor/packages b/tools/tests/apps/caching-stylus/.meteor/packages
index 26483fcc15..2a6b96c857 100644
--- a/tools/tests/apps/caching-stylus/.meteor/packages
+++ b/tools/tests/apps/caching-stylus/.meteor/packages
@@ -4,6 +4,6 @@
 # but you can also edit it by hand.
 
 meteor-base
-stylus@~2.513.13
+stylus@~2.513.14
 local-pack
 standard-minifiers
diff --git a/tools/tests/apps/dev-bundle-bin-commands/package.json b/tools/tests/apps/dev-bundle-bin-commands/package.json
index 7dcedabf8b..3725fff62f 100644
--- a/tools/tests/apps/dev-bundle-bin-commands/package.json
+++ b/tools/tests/apps/dev-bundle-bin-commands/package.json
@@ -8,6 +8,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "meteor-node-stubs": "^0.4.1"
   }
 }
diff --git a/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders b/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders
index 910574ce2d..4538749ab8 100644
--- a/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders
+++ b/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders
@@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
diff --git a/tools/tests/apps/dynamic-import/.meteor/packages b/tools/tests/apps/dynamic-import/.meteor/packages
index d705b9dbce..c99031ebff 100644
--- a/tools/tests/apps/dynamic-import/.meteor/packages
+++ b/tools/tests/apps/dynamic-import/.meteor/packages
@@ -4,23 +4,24 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.3.0             # Packages every Meteor app needs to have
+meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.4.2                   # The database Meteor supports right now
+mongo@1.5.0                   # The database Meteor supports right now
 blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
 reactive-var@1.0.11            # Reactive variable for tracker
 jquery@1.11.10                  # Helpful client-side library
-tracker@1.1.3                 # Meteor's client-side reactive programming library
+tracker@1.2.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-css@1.4.0   # CSS minifier run for production mode
-standard-minifier-js@2.3.1    # JS minifier run for production mode
-es5-shim@4.7.0                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.10.0              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-css@1.4.1   # CSS minifier run for production mode
+standard-minifier-js@2.3.4    # JS minifier run for production mode
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.11.0              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.3.1            # Server-side component of the `meteor shell` command
 
 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
-dynamic-import@0.3.0
+dynamic-import@0.4.0
 lazy-test-package
 helper-package
 user:colon-name
+underscore
diff --git a/tools/tests/apps/dynamic-import/.meteor/release b/tools/tests/apps/dynamic-import/.meteor/release
index d502dc0d92..7f956de292 100644
--- a/tools/tests/apps/dynamic-import/.meteor/release
+++ b/tools/tests/apps/dynamic-import/.meteor/release
@@ -1 +1 @@
-METEOR@1.6.1
+METEOR@1.7.0.1
diff --git a/tools/tests/apps/dynamic-import/.meteor/versions b/tools/tests/apps/dynamic-import/.meteor/versions
new file mode 100644
index 0000000000..0d014bc9d2
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.meteor/versions
@@ -0,0 +1,82 @@
+allow-deny@1.1.0
+autopublish@1.0.7
+autoupdate@1.4.0
+babel-compiler@7.1.0
+babel-runtime@1.2.2
+base64@1.0.11
+binary-heap@1.0.10
+blaze@2.3.2
+blaze-html-templates@1.1.2
+blaze-tools@1.0.10
+boilerplate-generator@1.5.0
+caching-compiler@1.1.12
+caching-html-compiler@1.1.2
+callback-hook@1.1.0
+check@1.3.1
+coffeescript@2.2.1_1
+coffeescript-compiler@2.2.1_1
+ddp@1.4.0
+ddp-client@2.3.2
+ddp-common@1.4.0
+ddp-server@2.2.0
+deps@1.0.12
+diff-sequence@1.1.0
+dynamic-import@0.4.0
+ecmascript@0.11.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.1
+ecmascript-runtime-server@0.7.0
+ejson@1.1.0
+es5-shim@4.8.0
+geojson-utils@1.0.10
+helper-package@0.0.1
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.4.1
+id-map@1.1.0
+insecure@1.0.7
+jquery@1.11.11
+launch-screen@1.1.1
+lazy-test-package@0.0.1
+livedata@1.0.18
+logging@1.1.20
+meteor@1.9.0
+meteor-base@1.4.0
+minifier-css@1.3.1
+minifier-js@2.3.5
+minimongo@1.4.4
+mobile-experience@1.0.5
+mobile-status-bar@1.0.14
+modern-browsers@0.1.1
+modules@0.12.0
+modules-runtime@0.10.0
+mongo@1.5.0
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.0.7
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.1
+random@1.1.0
+reactive-var@1.0.11
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.0.13
+shell-server@0.3.1
+socket-stream-client@0.2.1
+spacebars@1.0.15
+spacebars-compiler@1.1.3
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
+templating@1.3.2
+templating-compiler@1.3.3
+templating-runtime@1.3.2
+templating-tools@1.1.2
+tracker@1.2.0
+ui@1.0.13
+underscore@1.0.10
+url@1.2.0
+user:colon-name@0.0.1
+webapp@1.6.0
+webapp-hashing@1.0.9
diff --git a/tools/tests/apps/dynamic-import/package-lock.json b/tools/tests/apps/dynamic-import/package-lock.json
index e9cc95361d..042c6308d7 100644
--- a/tools/tests/apps/dynamic-import/package-lock.json
+++ b/tools/tests/apps/dynamic-import/package-lock.json
@@ -4,12 +4,12 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz",
-      "integrity": "sha512-/3a3USMKk54BEHhDgY8rtxtaQOs4bp4aQwo6SDtdwmrXmgSgEusWuXNX5oIs/nwzmTD9o8wz2EyAjA+uHDMmJA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.49.tgz",
+      "integrity": "sha1-A7O/B+uYIHLI6FHdLd1RECguYb8=",
       "requires": {
-        "core-js": "2.5.5",
-        "regenerator-runtime": "0.11.1"
+        "core-js": "^2.5.6",
+        "regenerator-runtime": "^0.11.1"
       }
     },
     "acorn": {
@@ -28,16 +28,16 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "core-js": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz",
-      "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
     "encoding": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "0.4.19"
+        "iconv-lite": "0.4.23"
       }
     },
     "fbjs": {
@@ -51,7 +51,7 @@
         "object-assign": "4.1.1",
         "promise": "7.3.1",
         "setimmediate": "1.0.5",
-        "ua-parser-js": "0.7.17"
+        "ua-parser-js": "0.7.18"
       },
       "dependencies": {
         "core-js": {
@@ -62,9 +62,12 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
     },
     "is-stream": {
       "version": "1.1.0",
@@ -77,7 +80,7 @@
       "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "requires": {
         "node-fetch": "1.7.3",
-        "whatwg-fetch": "2.0.3"
+        "whatwg-fetch": "2.0.4"
       }
     },
     "js-tokens": {
@@ -103,640 +106,497 @@
       }
     },
     "meteor-node-stubs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz",
-      "integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
+      "integrity": "sha512-UO2OStvLOKoApmOdIP5eCqoLaa/ritMXRg4ffJVdkNLEsczzPvTjgC0Mxk4cM4R8MZkwll90FYgjDf5qUTJdMA==",
       "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "1.1.1",
+        "assert": "^1.4.1",
+        "browserify-zlib": "^0.1.4",
+        "buffer": "^4.9.1",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.7",
+        "events": "^1.1.1",
         "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
+        "os-browserify": "^0.2.1",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.0",
-        "string_decoder": "1.1.0",
-        "timers-browserify": "1.4.2",
+        "process": "^0.11.9",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^2.3.6",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.8.0",
+        "string_decoder": "^1.1.0",
+        "timers-browserify": "^1.4.2",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
         "asn1.js": {
           "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
           }
         },
         "assert": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-          "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+          "bundled": true,
           "requires": {
             "util": "0.10.3"
           }
         },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
         "base64-js": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-          "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
+          "version": "1.3.0",
+          "bundled": true
         },
         "bn.js": {
           "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
+          "bundled": true
         },
         "brorand": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+          "bundled": true
         },
         "browserify-aes": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-          "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
-            "buffer-xor": "1.0.3",
-            "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
-            "evp_bytestokey": "1.0.3",
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "browserify-cipher": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-          "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "browserify-aes": "1.1.1",
-            "browserify-des": "1.0.0",
-            "evp_bytestokey": "1.0.3"
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
           }
         },
         "browserify-des": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-          "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "des.js": "1.0.0",
-            "inherits": "2.0.1"
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "browserify-rsa": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-          "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "randombytes": "^2.0.1"
           }
         },
         "browserify-sign": {
           "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-          "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "elliptic": "6.4.0",
-            "inherits": "2.0.1",
-            "parse-asn1": "5.1.0"
+            "bn.js": "^4.1.1",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.2",
+            "elliptic": "^6.0.0",
+            "inherits": "^2.0.1",
+            "parse-asn1": "^5.0.0"
           }
         },
         "browserify-zlib": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+          "bundled": true,
           "requires": {
-            "pako": "0.2.9"
+            "pako": "~0.2.0"
           }
         },
         "buffer": {
           "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+          "bundled": true,
           "requires": {
-            "base64-js": "1.2.3",
-            "ieee754": "1.1.8",
-            "isarray": "1.0.0"
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
           }
         },
         "buffer-xor": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+          "bundled": true
         },
         "builtin-status-codes": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+          "bundled": true
         },
         "cipher-base": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
         "console-browserify": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-          "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+          "bundled": true,
           "requires": {
-            "date-now": "0.1.4"
+            "date-now": "^0.1.4"
           }
         },
         "constants-browserify": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
         },
         "create-ecdh": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-          "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+          "version": "4.0.3",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "elliptic": "6.4.0"
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.0.0"
           }
         },
         "create-hash": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-          "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "sha.js": "2.4.10"
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
           }
         },
         "create-hmac": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-          "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+          "version": "1.1.7",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
-            "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
           }
         },
         "crypto-browserify": {
           "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-          "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+          "bundled": true,
           "requires": {
-            "browserify-cipher": "1.0.0",
-            "browserify-sign": "4.0.4",
-            "create-ecdh": "4.0.0",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "diffie-hellman": "5.0.2",
-            "inherits": "2.0.1",
-            "pbkdf2": "3.0.14",
-            "public-encrypt": "4.0.0",
-            "randombytes": "2.0.6",
-            "randomfill": "1.0.4"
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
           }
         },
         "date-now": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+          "bundled": true
         },
         "des.js": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-          "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
           }
         },
         "diffie-hellman": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-          "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+          "version": "5.0.3",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "miller-rabin": "4.0.1",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
           }
         },
         "domain-browser": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+          "bundled": true
         },
         "elliptic": {
           "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-          "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "brorand": "1.1.0",
-            "hash.js": "1.1.3",
-            "hmac-drbg": "1.0.1",
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0",
-            "minimalistic-crypto-utils": "1.0.1"
+            "bn.js": "^4.4.0",
+            "brorand": "^1.0.1",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.0"
           }
         },
         "events": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+          "bundled": true
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+          "bundled": true,
           "requires": {
-            "md5.js": "1.3.4",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.1",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
           }
         },
         "hash-base": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-          "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+          "version": "3.0.4",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "hash.js": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-          "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "minimalistic-assert": "1.0.0"
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.0"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
         "hmac-drbg": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+          "bundled": true,
           "requires": {
-            "hash.js": "1.1.3",
-            "minimalistic-assert": "1.0.0",
-            "minimalistic-crypto-utils": "1.0.1"
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
           }
         },
         "https-browserify": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI="
+          "bundled": true
         },
         "ieee754": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+          "version": "1.1.11",
+          "bundled": true
         },
         "indexof": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-          "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "inherits": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "bundled": true
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "bundled": true
         },
         "md5.js": {
           "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-          "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+          "bundled": true,
           "requires": {
-            "hash-base": "3.0.4",
-            "inherits": "2.0.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-              "requires": {
-                "inherits": "2.0.1",
-                "safe-buffer": "5.1.1"
-              }
-            }
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "miller-rabin": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "brorand": "1.1.0"
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-          "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
+          "version": "1.0.1",
+          "bundled": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "os-browserify": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8="
+          "bundled": true
         },
         "pako": {
           "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+          "bundled": true
         },
         "parse-asn1": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-          "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+          "version": "5.1.1",
+          "bundled": true,
           "requires": {
-            "asn1.js": "4.10.1",
-            "browserify-aes": "1.1.1",
-            "create-hash": "1.1.3",
-            "evp_bytestokey": "1.0.3",
-            "pbkdf2": "3.0.14"
+            "asn1.js": "^4.0.0",
+            "browserify-aes": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3"
           }
         },
         "path-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-          "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+          "bundled": true
         },
         "pbkdf2": {
-          "version": "3.0.14",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-          "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+          "version": "3.0.16",
+          "bundled": true,
           "requires": {
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
           }
         },
         "process": {
           "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+          "bundled": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "bundled": true
         },
         "public-encrypt": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-          "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+          "version": "4.0.2",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "parse-asn1": "5.1.0",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1"
           }
         },
         "punycode": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "bundled": true
         },
         "querystring": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+          "bundled": true
         },
         "querystring-es3": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+          "bundled": true
         },
         "randombytes": {
           "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-          "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "^5.1.0"
           }
         },
         "randomfill": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+          "bundled": true,
           "requires": {
-            "randombytes": "2.0.6",
-            "safe-buffer": "5.1.1"
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
           }
         },
         "readable-stream": {
-          "version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+          "version": "2.3.6",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.0",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
         "ripemd160": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-          "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+          "version": "2.0.2",
+          "bundled": true,
           "requires": {
-            "hash-base": "2.0.2",
-            "inherits": "2.0.1"
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "version": "5.1.2",
+          "bundled": true
         },
         "sha.js": {
-          "version": "2.4.10",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-          "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+          "version": "2.4.11",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "stream-browserify": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-          "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12"
+            "inherits": "~2.0.1",
+            "readable-stream": "^2.0.2"
           }
         },
         "stream-http": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
-          "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
+          "version": "2.8.1",
+          "bundled": true,
           "requires": {
-            "builtin-status-codes": "3.0.0",
-            "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
-            "to-arraybuffer": "1.0.1",
-            "xtend": "4.0.1"
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.3.3",
+            "to-arraybuffer": "^1.0.0",
+            "xtend": "^4.0.0"
           }
         },
         "string_decoder": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
-          "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
+          "version": "1.1.1",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         },
         "timers-browserify": {
           "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+          "bundled": true,
           "requires": {
-            "process": "0.11.10"
+            "process": "~0.11.0"
           }
         },
         "to-arraybuffer": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+          "bundled": true
         },
         "tty-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+          "bundled": true
         },
         "url": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "bundled": true,
           "requires": {
             "punycode": "1.3.2",
             "querystring": "0.2.0"
@@ -744,48 +604,38 @@
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+              "bundled": true
             }
           }
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+          "bundled": true
         },
         "vm-browserify": {
           "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+          "bundled": true,
           "requires": {
             "indexof": "0.0.1"
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
         "xtend": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+          "bundled": true
         }
       }
     },
     "moment": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
-      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ=="
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz",
+      "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ=="
     },
     "node-fetch": {
       "version": "1.7.3",
@@ -838,9 +688,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "react": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.2.0.tgz",
-      "integrity": "sha512-ZmIomM7EE1DvPEnSFAHZn9Vs9zJl5A9H7el0EGTE6ZbW9FKe/14IYAlPbC8iH25YarEQxZL+E8VW7Mi7kfQrDQ==",
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-o5GPdkhciQ3cEph6qgvYB7LTOHw/GB0qRI6ZFNugj49qJCFfgHwVNjZ5u+b7nif4vOeMIOuYj3CeYe2IBD74lg==",
       "requires": {
         "fbjs": "0.8.16",
         "loose-envify": "1.3.1",
@@ -853,15 +703,20 @@
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "ua-parser-js": {
-      "version": "0.7.17",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
-      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
+      "version": "0.7.18",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz",
+      "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA=="
     },
     "uuid": {
       "version": "3.2.1",
@@ -869,9 +724,9 @@
       "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
     },
     "whatwg-fetch": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
-      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
+      "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
     },
     "yallist": {
       "version": "2.1.2",
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
index 040fcc5124..6cfb8ecbe7 100644
--- a/tools/tests/apps/dynamic-import/package.json
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -6,10 +6,10 @@
     "test": "meteor test --full-app --driver-package dispatch:mocha-browser"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "^7.0.0-beta.49",
     "acorn": "^4.0.11",
     "arson": "^0.2.3",
-    "meteor-node-stubs": "^0.3.2",
+    "meteor-node-stubs": "^0.4.1",
     "moment": "^2.17.1",
     "optimism": "^0.3.3",
     "private": "^0.1.7",
diff --git a/tools/tests/apps/meteor-ignore/package-lock.json b/tools/tests/apps/meteor-ignore/package-lock.json
index 6302e0fc5e..2420e5e56a 100644
--- a/tools/tests/apps/meteor-ignore/package-lock.json
+++ b/tools/tests/apps/meteor-ignore/package-lock.json
@@ -18,9 +18,9 @@
       "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
     },
     "meteor-node-stubs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz",
-      "integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
+      "integrity": "sha512-UO2OStvLOKoApmOdIP5eCqoLaa/ritMXRg4ffJVdkNLEsczzPvTjgC0Mxk4cM4R8MZkwll90FYgjDf5qUTJdMA==",
       "requires": {
         "assert": "1.4.1",
         "browserify-zlib": "0.1.4",
@@ -36,10 +36,10 @@
         "process": "0.11.10",
         "punycode": "1.4.1",
         "querystring-es3": "0.2.1",
-        "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+        "readable-stream": "2.3.6",
         "stream-browserify": "2.0.1",
-        "stream-http": "2.8.0",
-        "string_decoder": "1.1.0",
+        "stream-http": "2.8.1",
+        "string_decoder": "1.1.1",
         "timers-browserify": "1.4.2",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
@@ -49,78 +49,56 @@
       "dependencies": {
         "asn1.js": {
           "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           }
         },
         "assert": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-          "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+          "bundled": true,
           "requires": {
             "util": "0.10.3"
           }
         },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
         "base64-js": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-          "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
+          "version": "1.3.0",
+          "bundled": true
         },
         "bn.js": {
           "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
+          "bundled": true
         },
         "brorand": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+          "bundled": true
         },
         "browserify-aes": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-          "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
             "buffer-xor": "1.0.3",
             "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
+            "create-hash": "1.2.0",
             "evp_bytestokey": "1.0.3",
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "browserify-cipher": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-          "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "browserify-aes": "1.1.1",
-            "browserify-des": "1.0.0",
+            "browserify-aes": "1.2.0",
+            "browserify-des": "1.0.1",
             "evp_bytestokey": "1.0.3"
           }
         },
         "browserify-des": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-          "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
             "des.js": "1.0.0",
@@ -129,8 +107,7 @@
         },
         "browserify-rsa": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-          "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "randombytes": "2.0.6"
@@ -138,142 +115,127 @@
         },
         "browserify-sign": {
           "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-          "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
             "elliptic": "6.4.0",
             "inherits": "2.0.1",
-            "parse-asn1": "5.1.0"
+            "parse-asn1": "5.1.1"
           }
         },
         "browserify-zlib": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+          "bundled": true,
           "requires": {
             "pako": "0.2.9"
           }
         },
         "buffer": {
           "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+          "bundled": true,
           "requires": {
-            "base64-js": "1.2.3",
-            "ieee754": "1.1.8",
+            "base64-js": "1.3.0",
+            "ieee754": "1.1.11",
             "isarray": "1.0.0"
           }
         },
         "buffer-xor": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+          "bundled": true
         },
         "builtin-status-codes": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+          "bundled": true
         },
         "cipher-base": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
         "console-browserify": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-          "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+          "bundled": true,
           "requires": {
             "date-now": "0.1.4"
           }
         },
         "constants-browserify": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
         },
         "create-ecdh": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-          "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+          "version": "4.0.3",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "elliptic": "6.4.0"
           }
         },
         "create-hash": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-          "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
             "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "sha.js": "2.4.10"
+            "md5.js": "1.3.4",
+            "ripemd160": "2.0.2",
+            "sha.js": "2.4.11"
           }
         },
         "create-hmac": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-          "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+          "version": "1.1.7",
+          "bundled": true,
           "requires": {
             "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
+            "create-hash": "1.2.0",
             "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "ripemd160": "2.0.2",
+            "safe-buffer": "5.1.2",
+            "sha.js": "2.4.11"
           }
         },
         "crypto-browserify": {
           "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-          "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+          "bundled": true,
           "requires": {
-            "browserify-cipher": "1.0.0",
+            "browserify-cipher": "1.0.1",
             "browserify-sign": "4.0.4",
-            "create-ecdh": "4.0.0",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "diffie-hellman": "5.0.2",
+            "create-ecdh": "4.0.3",
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
+            "diffie-hellman": "5.0.3",
             "inherits": "2.0.1",
-            "pbkdf2": "3.0.14",
-            "public-encrypt": "4.0.0",
+            "pbkdf2": "3.0.16",
+            "public-encrypt": "4.0.2",
             "randombytes": "2.0.6",
             "randomfill": "1.0.4"
           }
         },
         "date-now": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+          "bundled": true
         },
         "des.js": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-          "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           }
         },
         "diffie-hellman": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-          "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+          "version": "5.0.3",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "miller-rabin": "4.0.1",
@@ -282,376 +244,271 @@
         },
         "domain-browser": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+          "bundled": true
         },
         "elliptic": {
           "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-          "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "brorand": "1.1.0",
             "hash.js": "1.1.3",
             "hmac-drbg": "1.0.1",
             "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0",
+            "minimalistic-assert": "1.0.1",
             "minimalistic-crypto-utils": "1.0.1"
           }
         },
         "events": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+          "bundled": true
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+          "bundled": true,
           "requires": {
             "md5.js": "1.3.4",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.1",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "hash-base": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-          "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+          "version": "3.0.4",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1"
+            "inherits": "2.0.1",
+            "safe-buffer": "5.1.2"
           }
         },
         "hash.js": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-          "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.3",
-            "minimalistic-assert": "1.0.0"
+            "minimalistic-assert": "1.0.1"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
         "hmac-drbg": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+          "bundled": true,
           "requires": {
             "hash.js": "1.1.3",
-            "minimalistic-assert": "1.0.0",
+            "minimalistic-assert": "1.0.1",
             "minimalistic-crypto-utils": "1.0.1"
           }
         },
         "https-browserify": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI="
+          "bundled": true
         },
         "ieee754": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+          "version": "1.1.11",
+          "bundled": true
         },
         "indexof": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-          "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "inherits": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "bundled": true
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "bundled": true
         },
         "md5.js": {
           "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-          "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+          "bundled": true,
           "requires": {
             "hash-base": "3.0.4",
             "inherits": "2.0.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-              "requires": {
-                "inherits": "2.0.1",
-                "safe-buffer": "5.1.1"
-              }
-            }
           }
         },
         "miller-rabin": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "brorand": "1.1.0"
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-          "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
+          "version": "1.0.1",
+          "bundled": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "os-browserify": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8="
+          "bundled": true
         },
         "pako": {
           "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+          "bundled": true
         },
         "parse-asn1": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-          "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+          "version": "5.1.1",
+          "bundled": true,
           "requires": {
             "asn1.js": "4.10.1",
-            "browserify-aes": "1.1.1",
-            "create-hash": "1.1.3",
+            "browserify-aes": "1.2.0",
+            "create-hash": "1.2.0",
             "evp_bytestokey": "1.0.3",
-            "pbkdf2": "3.0.14"
+            "pbkdf2": "3.0.16"
           }
         },
         "path-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-          "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+          "bundled": true
         },
         "pbkdf2": {
-          "version": "3.0.14",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-          "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+          "version": "3.0.16",
+          "bundled": true,
           "requires": {
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "create-hash": "1.2.0",
+            "create-hmac": "1.1.7",
+            "ripemd160": "2.0.2",
+            "safe-buffer": "5.1.2",
+            "sha.js": "2.4.11"
           }
         },
         "process": {
           "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+          "bundled": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "bundled": true
         },
         "public-encrypt": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-          "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+          "version": "4.0.2",
+          "bundled": true,
           "requires": {
             "bn.js": "4.11.8",
             "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "parse-asn1": "5.1.0",
+            "create-hash": "1.2.0",
+            "parse-asn1": "5.1.1",
             "randombytes": "2.0.6"
           }
         },
         "punycode": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "bundled": true
         },
         "querystring": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+          "bundled": true
         },
         "querystring-es3": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+          "bundled": true
         },
         "randombytes": {
           "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-          "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "randomfill": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+          "bundled": true,
           "requires": {
             "randombytes": "2.0.6",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "readable-stream": {
-          "version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+          "version": "2.3.6",
+          "bundled": true,
           "requires": {
+            "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
         "ripemd160": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-          "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+          "version": "2.0.2",
+          "bundled": true,
           "requires": {
-            "hash-base": "2.0.2",
+            "hash-base": "3.0.4",
             "inherits": "2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "version": "5.1.2",
+          "bundled": true
         },
         "sha.js": {
-          "version": "2.4.10",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-          "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+          "version": "2.4.11",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "stream-browserify": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-          "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12"
+            "readable-stream": "2.3.6"
           }
         },
         "stream-http": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
-          "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
+          "version": "2.8.1",
+          "bundled": true,
           "requires": {
             "builtin-status-codes": "3.0.0",
             "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+            "readable-stream": "2.3.6",
             "to-arraybuffer": "1.0.1",
             "xtend": "4.0.1"
           }
         },
         "string_decoder": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
-          "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
+          "version": "1.1.1",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "timers-browserify": {
           "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+          "bundled": true,
           "requires": {
             "process": "0.11.10"
           }
         },
         "to-arraybuffer": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+          "bundled": true
         },
         "tty-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+          "bundled": true
         },
         "url": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "bundled": true,
           "requires": {
             "punycode": "1.3.2",
             "querystring": "0.2.0"
@@ -659,41 +516,31 @@
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+              "bundled": true
             }
           }
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+          "bundled": true
         },
         "vm-browserify": {
           "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+          "bundled": true,
           "requires": {
             "indexof": "0.0.1"
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
         "xtend": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+          "bundled": true
         }
       }
     },
diff --git a/tools/tests/apps/meteor-ignore/package.json b/tools/tests/apps/meteor-ignore/package.json
index c0d547455e..4ebddd0ab2 100644
--- a/tools/tests/apps/meteor-ignore/package.json
+++ b/tools/tests/apps/meteor-ignore/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "meteor-node-stubs": "^0.4.1"
   }
 }
diff --git a/tools/tests/apps/modules/.meteor/.finished-upgraders b/tools/tests/apps/modules/.meteor/.finished-upgraders
index 2a56593d3f..8f397c7dad 100644
--- a/tools/tests/apps/modules/.meteor/.finished-upgraders
+++ b/tools/tests/apps/modules/.meteor/.finished-upgraders
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index e74f6294a3..a4c79d6cbf 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -4,23 +4,23 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base@1.3.0             # Packages every Meteor app needs to have
+meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.4.2                   # The database Meteor supports right now
+mongo@1.5.0                   # The database Meteor supports right now
 blaze-html-templates    # Compile .html files into Meteor Blaze views
 session@1.1.7                 # Client-side reactive dictionary for your app
 jquery@1.11.10                  # Helpful client-side library
-tracker@1.1.3                 # Meteor's client-side reactive programming library
+tracker@1.2.0                 # Meteor's client-side reactive programming library
 
-es5-shim@4.7.0                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.10.0              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.11.0              # Enable ECMAScript2015+ syntax in app code
 
 coffeescript
 modules-test-package
-standard-minifier-css@1.4.0
-standard-minifier-js@2.3.1
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
 client-only-ecmascript
 modules-test-plugin
 shell-server@0.3.1
-dynamic-import@0.3.0
-underscore
+dynamic-import@0.4.0
+underscore@1.0.10
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index d502dc0d92..cc4631c0b6 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.6.1
+METEOR@1.7
diff --git a/tools/tests/apps/modules/package-lock.json b/tools/tests/apps/modules/package-lock.json
index 03dcd090a9..0138f86395 100644
--- a/tools/tests/apps/modules/package-lock.json
+++ b/tools/tests/apps/modules/package-lock.json
@@ -4,177 +4,182 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz",
-      "integrity": "sha512-7BKRkmYaPZm3Yff5HGZJKCz7RqZ5jUjknsXT6Gz5YKG23J3uq9hAj0epncCB0rlqmnZ8Q+UUpQB2tCR5mT37vw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz",
+      "integrity": "sha1-vs2AVIJzREDJ0TfkbXc0DmTX9Rs=",
       "requires": {
-        "@babel/highlight": "7.0.0-beta.46"
+        "@babel/highlight": "7.0.0-beta.49"
       }
     },
     "@babel/core": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.46.tgz",
-      "integrity": "sha512-lCDbBSAhNAt+nL98xbgWmuhgrIxKvbvFHf73zlNCuXCHJkdlo7qzTofYK0ZWb+OVce8fQ17fC7DwTIhAwowzMw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.49.tgz",
+      "integrity": "sha1-c94ggd1lJIlInwy0qpeCmhEzMU4=",
       "requires": {
-        "@babel/code-frame": "7.0.0-beta.46",
-        "@babel/generator": "7.0.0-beta.46",
-        "@babel/helpers": "7.0.0-beta.46",
-        "@babel/template": "7.0.0-beta.46",
-        "@babel/traverse": "7.0.0-beta.46",
-        "@babel/types": "7.0.0-beta.46",
-        "babylon": "7.0.0-beta.46",
-        "convert-source-map": "1.5.1",
-        "debug": "3.1.0",
-        "json5": "0.5.1",
-        "lodash": "4.17.5",
-        "micromatch": "2.3.11",
-        "resolve": "1.7.1",
-        "semver": "5.5.0",
-        "source-map": "0.5.7"
+        "@babel/code-frame": "7.0.0-beta.49",
+        "@babel/generator": "7.0.0-beta.49",
+        "@babel/helpers": "7.0.0-beta.49",
+        "@babel/parser": "7.0.0-beta.49",
+        "@babel/template": "7.0.0-beta.49",
+        "@babel/traverse": "7.0.0-beta.49",
+        "@babel/types": "7.0.0-beta.49",
+        "convert-source-map": "^1.1.0",
+        "debug": "^3.1.0",
+        "json5": "^0.5.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^2.3.11",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
       }
     },
     "@babel/generator": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.46.tgz",
-      "integrity": "sha512-5VfaEVkPG0gpNSTcf70jvV+MjbMoNn4g2iluwM7MhciedkolEtmG7PcdoUj5W1EmMfngz5cF65V7UMZXJO6y8Q==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.49.tgz",
+      "integrity": "sha1-6c/9qROZaszseTu8JauRvBnQv3o=",
       "requires": {
-        "@babel/types": "7.0.0-beta.46",
-        "jsesc": "2.5.1",
-        "lodash": "4.17.5",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "@babel/types": "7.0.0-beta.49",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.5",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz",
-      "integrity": "sha512-zm4Kc5XB2njGs8PkmjV1zE/g1hBuphbh+VcDyFLaQsxkxSFSUtCbKwFL8AQpL/qPIcGbvX1MBt50a/3ZZH2CQA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.49.tgz",
+      "integrity": "sha1-olwRGbnwNSeGcBJuAiXAMEHI3jI=",
       "requires": {
-        "@babel/helper-get-function-arity": "7.0.0-beta.46",
-        "@babel/template": "7.0.0-beta.46",
-        "@babel/types": "7.0.0-beta.46"
+        "@babel/helper-get-function-arity": "7.0.0-beta.49",
+        "@babel/template": "7.0.0-beta.49",
+        "@babel/types": "7.0.0-beta.49"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz",
-      "integrity": "sha512-dPrTb7QHVx44xJLjUl3LGAc13iS7hdXdO0fiOxdRN1suIS91yGGgeuwiQBlrw5SxbFchYtwenhlKbqHdVfGyVA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.49.tgz",
+      "integrity": "sha1-z1Aj8y0q2S0Ic3STnOwJUby1FEE=",
       "requires": {
-        "@babel/types": "7.0.0-beta.46"
+        "@babel/types": "7.0.0-beta.49"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.46.tgz",
-      "integrity": "sha512-eRTFH+/1rqDfzx+Z//CYk4TNwhfPQpM/TCs4CmHu2DwCPrqFnKUZLI1KgStfLf//c8FdOqx/U9EPec7s8CbUIA=="
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.49.tgz",
+      "integrity": "sha1-Dp/LuDT4eLs2XSqOqQ7uIbo8zSM="
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz",
-      "integrity": "sha512-UT7acgV7wsnBPwnqslqcnUFvsPBP4TtVaYM82xPGA7+evAa8q8HXOmFk08qsMK/pX/yy4+51gJJwyw2zofnacA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.49.tgz",
+      "integrity": "sha1-QNeO2glo0BGxxShm5XRs+yPldUg=",
       "requires": {
-        "@babel/types": "7.0.0-beta.46"
+        "@babel/types": "7.0.0-beta.49"
       }
     },
     "@babel/helpers": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.46.tgz",
-      "integrity": "sha512-mbpH9pM3pJzo/tBr75U+zva3pqpyivogt1aofgEoD7bWFAYSuqOudRuz+m4XP6VPxxLoxcA4SFPGkuLRt9+7nQ==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0-beta.49.tgz",
+      "integrity": "sha1-BU2EAy1OlChqgFhlAAaOQQBaUdA=",
       "requires": {
-        "@babel/template": "7.0.0-beta.46",
-        "@babel/traverse": "7.0.0-beta.46",
-        "@babel/types": "7.0.0-beta.46"
+        "@babel/template": "7.0.0-beta.49",
+        "@babel/traverse": "7.0.0-beta.49",
+        "@babel/types": "7.0.0-beta.49"
       }
     },
     "@babel/highlight": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.46.tgz",
-      "integrity": "sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.49.tgz",
+      "integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=",
       "requires": {
-        "chalk": "2.4.0",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.0"
       }
     },
+    "@babel/parser": {
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.49.tgz",
+      "integrity": "sha1-lE0MW6KBK7FZ7b0iZ0Ov0mUXm9w="
+    },
     "@babel/plugin-proposal-do-expressions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-C0Sr5AXHLZz+vp3x+4j5hUdAmTX3m8rjScJC91wlme7xLZfmRGEfOgq09QTVaWqlutpaof1lsmp9zKAlEv1asw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.0.0-beta.49.tgz",
+      "integrity": "sha1-JMwT311JnPLKNKxI1EO1U6Zg4Xg=",
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0-beta.46",
-        "@babel/plugin-syntax-do-expressions": "7.0.0-beta.46"
+        "@babel/helper-plugin-utils": "7.0.0-beta.49",
+        "@babel/plugin-syntax-do-expressions": "7.0.0-beta.49"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.0.0-beta.46.tgz",
-      "integrity": "sha512-aAHryJWDhkEN7/bIYdr5ueaL5rFfwfnuiGW+6xDpylg+KaJmS0CmzZAxJQNxw0lYNZhBQNzWvJTesli5VsSrWg==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.0.0-beta.49.tgz",
+      "integrity": "sha1-1uF1f91DmmK4T68qhR6CKhjitCw=",
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0-beta.46",
-        "@babel/plugin-syntax-optional-chaining": "7.0.0-beta.46"
+        "@babel/helper-plugin-utils": "7.0.0-beta.49",
+        "@babel/plugin-syntax-optional-chaining": "7.0.0-beta.49"
       }
     },
     "@babel/plugin-syntax-do-expressions": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.0.0-beta.46.tgz",
-      "integrity": "sha512-JqrbOrldoeFUoa+teISIt3tg+4vsUEdwb9LUQ8McC2RGZHfn/XT0xiHAof7P51zi2EHtQ+l/1bcv5+mxqGo5Sw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.0.0-beta.49.tgz",
+      "integrity": "sha1-DOL6KW2UL2Nl+o5dxT/DjMXwwL4=",
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0-beta.46"
+        "@babel/helper-plugin-utils": "7.0.0-beta.49"
       }
     },
     "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.0.0-beta.46.tgz",
-      "integrity": "sha512-/TTGzn3twKp7PhFi0ZKA0M+29pm+L3KeUygZZ9FupD4f5i3GNeW/HBBivYcIdZz+Wa1AoUffYtLJSVdpshFKkw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.0.0-beta.49.tgz",
+      "integrity": "sha1-AHtefvY5uW1Y52O7XI2hRJhEuXY=",
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0-beta.46"
+        "@babel/helper-plugin-utils": "7.0.0-beta.49"
       }
     },
     "@babel/runtime": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz",
-      "integrity": "sha512-/3a3USMKk54BEHhDgY8rtxtaQOs4bp4aQwo6SDtdwmrXmgSgEusWuXNX5oIs/nwzmTD9o8wz2EyAjA+uHDMmJA==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.49.tgz",
+      "integrity": "sha1-A7O/B+uYIHLI6FHdLd1RECguYb8=",
       "requires": {
-        "core-js": "2.5.5",
-        "regenerator-runtime": "0.11.1"
+        "core-js": "^2.5.6",
+        "regenerator-runtime": "^0.11.1"
       }
     },
     "@babel/template": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.46.tgz",
-      "integrity": "sha512-3/qi4m0l6G/vZbEwtqfzJk73mYtuE7nvAO1zT3/ZrTAHy4sHf2vaF9Eh1w+Tau263Yrkh0bjVQPb9zw6G+GeMQ==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.49.tgz",
+      "integrity": "sha1-44q+ghfLl5P0YaUwbXrXRdg+HSc=",
       "requires": {
-        "@babel/code-frame": "7.0.0-beta.46",
-        "@babel/types": "7.0.0-beta.46",
-        "babylon": "7.0.0-beta.46",
-        "lodash": "4.17.5"
+        "@babel/code-frame": "7.0.0-beta.49",
+        "@babel/parser": "7.0.0-beta.49",
+        "@babel/types": "7.0.0-beta.49",
+        "lodash": "^4.17.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.46.tgz",
-      "integrity": "sha512-IU7MTGbcjpfhf5tyCu3sDB7sWYainZQcT+CqOBdVZXZfq5MMr130R7aiZBI2g5dJYUaW1PS81DVNpd0/Sq/Gzg==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.49.tgz",
+      "integrity": "sha1-TypzaCoYM07WYl0QCo0nMZ98LWg=",
       "requires": {
-        "@babel/code-frame": "7.0.0-beta.46",
-        "@babel/generator": "7.0.0-beta.46",
-        "@babel/helper-function-name": "7.0.0-beta.46",
-        "@babel/helper-split-export-declaration": "7.0.0-beta.46",
-        "@babel/types": "7.0.0-beta.46",
-        "babylon": "7.0.0-beta.46",
-        "debug": "3.1.0",
-        "globals": "11.4.0",
-        "invariant": "2.2.4",
-        "lodash": "4.17.5"
+        "@babel/code-frame": "7.0.0-beta.49",
+        "@babel/generator": "7.0.0-beta.49",
+        "@babel/helper-function-name": "7.0.0-beta.49",
+        "@babel/helper-split-export-declaration": "7.0.0-beta.49",
+        "@babel/parser": "7.0.0-beta.49",
+        "@babel/types": "7.0.0-beta.49",
+        "debug": "^3.1.0",
+        "globals": "^11.1.0",
+        "invariant": "^2.2.0",
+        "lodash": "^4.17.5"
       }
     },
     "@babel/types": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.46.tgz",
-      "integrity": "sha512-uA5aruF2KKsJxToWdDpftsrPOIQtoGrGno2hiaeO9JRvfT9xZdK11nPoC+/RF9emNzmNbWn4HCRdCY+McT5Nbw==",
+      "version": "7.0.0-beta.49",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.49.tgz",
+      "integrity": "sha1-t+Oxw/TUz+Eb34yJ8e/V4WF7h6Y=",
       "requires": {
-        "esutils": "2.0.2",
-        "lodash": "4.17.5",
-        "to-fast-properties": "2.0.0"
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.5",
+        "to-fast-properties": "^2.0.0"
       }
     },
     "acorn": {
@@ -185,7 +190,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
-        "color-convert": "1.9.1"
+        "color-convert": "^1.9.0"
       }
     },
     "arr-diff": {
@@ -193,7 +198,7 @@
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
       "requires": {
-        "arr-flatten": "1.1.0"
+        "arr-flatten": "^1.0.1"
       }
     },
     "arr-flatten": {
@@ -217,9 +222,9 @@
       "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
     },
     "aws-sdk": {
-      "version": "2.212.1",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.212.1.tgz",
-      "integrity": "sha1-gz2+jYN9RgWKN3Ksm7c7aRExNuQ=",
+      "version": "2.247.1",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.247.1.tgz",
+      "integrity": "sha1-vl8iDUBmWskdOoSlHwKfoFVgxO4=",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
@@ -229,8 +234,7 @@
         "sax": "1.2.1",
         "url": "0.10.3",
         "uuid": "3.1.0",
-        "xml2js": "0.4.17",
-        "xmlbuilder": "4.2.1"
+        "xml2js": "0.4.17"
       },
       "dependencies": {
         "uuid": {
@@ -240,15 +244,25 @@
         }
       }
     },
-    "babylon": {
-      "version": "7.0.0-beta.46",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.46.tgz",
-      "integrity": "sha512-WFJlg2WatdkXRFMpk7BN/Uzzkjkcjk+WaqnrSCpay+RYl4ypW9ZetZyT9kNt22IH/BQNst3M6PaaBn9IXsUNrg=="
+    "babel-runtime": {
+      "version": "5.8.38",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
+      "integrity": "sha1-HAsC62MxL18If/IEUIJ7QlydTBk=",
+      "requires": {
+        "core-js": "^1.0.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        }
+      }
     },
     "base64-js": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "big-number": {
       "version": "0.3.1",
@@ -261,11 +275,12 @@
       "integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg=="
     },
     "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "requires": {
-        "readable-stream": "2.3.5"
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
       }
     },
     "bluebird": {
@@ -278,9 +293,9 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
       "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
       "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
       }
     },
     "buffer": {
@@ -288,19 +303,19 @@
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "requires": {
-        "base64-js": "1.2.3",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "chalk": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
-      "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "requires": {
-        "ansi-styles": "3.2.1",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.4.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "cli-color": {
@@ -308,8 +323,8 @@
       "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz",
       "integrity": "sha1-CiXOrlpqFgK+f3fShWPDZwAnTog=",
       "requires": {
-        "es5-ext": "0.9.2",
-        "memoizee": "0.2.6"
+        "es5-ext": "~0.9.2",
+        "memoizee": "~0.2.5"
       }
     },
     "color-convert": {
@@ -317,7 +332,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.1.1"
       }
     },
     "color-name": {
@@ -336,9 +351,9 @@
       "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU="
     },
     "core-js": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz",
-      "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -378,7 +393,7 @@
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz",
       "integrity": "sha1-yB43JOtVQHxaDV7jKZQR9wD1QpE=",
       "requires": {
-        "es5-ext": "0.9.2"
+        "es5-ext": "~0.9.2"
       }
     },
     "events": {
@@ -391,7 +406,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
       "requires": {
-        "is-posix-bracket": "0.1.1"
+        "is-posix-bracket": "^0.1.0"
       }
     },
     "expand-range": {
@@ -399,7 +414,7 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "requires": {
-        "fill-range": "2.2.3"
+        "fill-range": "^2.1.0"
       }
     },
     "extglob": {
@@ -407,7 +422,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
       }
     },
     "eyes": {
@@ -421,15 +436,15 @@
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
     },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
       }
     },
     "for-in": {
@@ -442,7 +457,7 @@
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
       }
     },
     "generic-pool": {
@@ -455,7 +470,7 @@
       "resolved": "https://registry.npmjs.org/github/-/github-0.2.4.tgz",
       "integrity": "sha1-JPp/DhP6EblGr5ETTFGYKpHOU4s=",
       "requires": {
-        "mime": "1.6.0"
+        "mime": "^1.2.11"
       }
     },
     "glob-base": {
@@ -463,8 +478,8 @@
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
       }
     },
     "glob-parent": {
@@ -472,13 +487,13 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
       "requires": {
-        "is-glob": "2.0.1"
+        "is-glob": "^2.0.0"
       }
     },
     "globals": {
-      "version": "11.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz",
-      "integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA=="
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
+      "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ=="
     },
     "has-flag": {
       "version": "3.0.0",
@@ -486,9 +501,12 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
     },
     "idle-gc": {
       "version": "1.0.1",
@@ -515,7 +533,7 @@
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "requires": {
-        "loose-envify": "1.3.1"
+        "loose-envify": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -533,7 +551,7 @@
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "requires": {
-        "is-primitive": "2.0.0"
+        "is-primitive": "^2.0.0"
       }
     },
     "is-extendable": {
@@ -551,7 +569,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^1.0.0"
       }
     },
     "is-number": {
@@ -559,7 +577,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
       "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       }
     },
     "is-posix-bracket": {
@@ -615,18 +633,18 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "requires": {
-        "is-buffer": "1.1.6"
+        "is-buffer": "^1.1.5"
       }
     },
     "lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
     "lodash-es": {
-      "version": "4.17.7",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.7.tgz",
-      "integrity": "sha512-jzqTi3vk4J5Dxq43cNjB0ekfCjPLHixoY2Sc0WHTo+0r928taLqe/VCt02vY5uQBvg0rdXgL3xWkK4X0MCmZcw=="
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz",
+      "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg=="
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
@@ -638,654 +656,516 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "requires": {
-        "js-tokens": "3.0.2"
+        "js-tokens": "^3.0.0"
       }
     },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
+    },
     "memoizee": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz",
       "integrity": "sha1-u0WnrQJTAILxYSZx2rNSGc0uB0E=",
       "requires": {
-        "es5-ext": "0.9.2",
-        "event-emitter": "0.2.2",
-        "next-tick": "0.1.0"
+        "es5-ext": "~0.9.2",
+        "event-emitter": "~0.2.2",
+        "next-tick": "0.1.x"
       }
     },
     "meteor-node-stubs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz",
-      "integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
+      "integrity": "sha512-UO2OStvLOKoApmOdIP5eCqoLaa/ritMXRg4ffJVdkNLEsczzPvTjgC0Mxk4cM4R8MZkwll90FYgjDf5qUTJdMA==",
       "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "1.1.1",
+        "assert": "^1.4.1",
+        "browserify-zlib": "^0.1.4",
+        "buffer": "^4.9.1",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.7",
+        "events": "^1.1.1",
         "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
+        "os-browserify": "^0.2.1",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.0",
-        "string_decoder": "1.1.0",
-        "timers-browserify": "1.4.2",
+        "process": "^0.11.9",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^2.3.6",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.8.0",
+        "string_decoder": "^1.1.0",
+        "timers-browserify": "^1.4.2",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
         "asn1.js": {
           "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
           }
         },
         "assert": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-          "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+          "bundled": true,
           "requires": {
             "util": "0.10.3"
           }
         },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
         "base64-js": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-          "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
+          "version": "1.3.0",
+          "bundled": true
         },
         "bn.js": {
           "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
+          "bundled": true
         },
         "brorand": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+          "bundled": true
         },
         "browserify-aes": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-          "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
-            "buffer-xor": "1.0.3",
-            "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
-            "evp_bytestokey": "1.0.3",
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "browserify-cipher": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-          "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "browserify-aes": "1.1.1",
-            "browserify-des": "1.0.0",
-            "evp_bytestokey": "1.0.3"
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
           }
         },
         "browserify-des": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-          "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+          "version": "1.0.1",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "des.js": "1.0.0",
-            "inherits": "2.0.1"
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "browserify-rsa": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-          "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "randombytes": "^2.0.1"
           }
         },
         "browserify-sign": {
           "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-          "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "elliptic": "6.4.0",
-            "inherits": "2.0.1",
-            "parse-asn1": "5.1.0"
+            "bn.js": "^4.1.1",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.2",
+            "elliptic": "^6.0.0",
+            "inherits": "^2.0.1",
+            "parse-asn1": "^5.0.0"
           }
         },
         "browserify-zlib": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+          "bundled": true,
           "requires": {
-            "pako": "0.2.9"
+            "pako": "~0.2.0"
           }
         },
         "buffer": {
           "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+          "bundled": true,
           "requires": {
-            "base64-js": "1.2.3",
-            "ieee754": "1.1.8",
-            "isarray": "1.0.0"
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
           }
         },
         "buffer-xor": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+          "bundled": true
         },
         "builtin-status-codes": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+          "bundled": true
         },
         "cipher-base": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
         "console-browserify": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-          "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+          "bundled": true,
           "requires": {
-            "date-now": "0.1.4"
+            "date-now": "^0.1.4"
           }
         },
         "constants-browserify": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
         },
         "create-ecdh": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-          "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+          "version": "4.0.3",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "elliptic": "6.4.0"
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.0.0"
           }
         },
         "create-hash": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-          "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+          "version": "1.2.0",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "sha.js": "2.4.10"
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
           }
         },
         "create-hmac": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-          "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+          "version": "1.1.7",
+          "bundled": true,
           "requires": {
-            "cipher-base": "1.0.4",
-            "create-hash": "1.1.3",
-            "inherits": "2.0.1",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
           }
         },
         "crypto-browserify": {
           "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-          "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+          "bundled": true,
           "requires": {
-            "browserify-cipher": "1.0.0",
-            "browserify-sign": "4.0.4",
-            "create-ecdh": "4.0.0",
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "diffie-hellman": "5.0.2",
-            "inherits": "2.0.1",
-            "pbkdf2": "3.0.14",
-            "public-encrypt": "4.0.0",
-            "randombytes": "2.0.6",
-            "randomfill": "1.0.4"
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
           }
         },
         "date-now": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+          "bundled": true
         },
         "des.js": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-          "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0"
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
           }
         },
         "diffie-hellman": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-          "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+          "version": "5.0.3",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "miller-rabin": "4.0.1",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
           }
         },
         "domain-browser": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-          "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+          "bundled": true
         },
         "elliptic": {
           "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-          "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "brorand": "1.1.0",
-            "hash.js": "1.1.3",
-            "hmac-drbg": "1.0.1",
-            "inherits": "2.0.1",
-            "minimalistic-assert": "1.0.0",
-            "minimalistic-crypto-utils": "1.0.1"
+            "bn.js": "^4.4.0",
+            "brorand": "^1.0.1",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.0"
           }
         },
         "events": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+          "bundled": true
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+          "bundled": true,
           "requires": {
-            "md5.js": "1.3.4",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.1",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
           }
         },
         "hash-base": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-          "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+          "version": "3.0.4",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "hash.js": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-          "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "minimalistic-assert": "1.0.0"
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.0"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
         "hmac-drbg": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+          "bundled": true,
           "requires": {
-            "hash.js": "1.1.3",
-            "minimalistic-assert": "1.0.0",
-            "minimalistic-crypto-utils": "1.0.1"
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
           }
         },
         "https-browserify": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI="
+          "bundled": true
         },
         "ieee754": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+          "version": "1.1.11",
+          "bundled": true
         },
         "indexof": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-          "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "inherits": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "bundled": true
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "bundled": true
         },
         "md5.js": {
           "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-          "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+          "bundled": true,
           "requires": {
-            "hash-base": "3.0.4",
-            "inherits": "2.0.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-              "requires": {
-                "inherits": "2.0.1",
-                "safe-buffer": "5.1.1"
-              }
-            }
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "miller-rabin": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "brorand": "1.1.0"
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-          "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
+          "version": "1.0.1",
+          "bundled": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1.0.2"
-          }
+          "bundled": true
         },
         "os-browserify": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8="
+          "bundled": true
         },
         "pako": {
           "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+          "bundled": true
         },
         "parse-asn1": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-          "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+          "version": "5.1.1",
+          "bundled": true,
           "requires": {
-            "asn1.js": "4.10.1",
-            "browserify-aes": "1.1.1",
-            "create-hash": "1.1.3",
-            "evp_bytestokey": "1.0.3",
-            "pbkdf2": "3.0.14"
+            "asn1.js": "^4.0.0",
+            "browserify-aes": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3"
           }
         },
         "path-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-          "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+          "bundled": true
         },
         "pbkdf2": {
-          "version": "3.0.14",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-          "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+          "version": "3.0.16",
+          "bundled": true,
           "requires": {
-            "create-hash": "1.1.3",
-            "create-hmac": "1.1.6",
-            "ripemd160": "2.0.1",
-            "safe-buffer": "5.1.1",
-            "sha.js": "2.4.10"
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
           }
         },
         "process": {
           "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+          "bundled": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+          "bundled": true
         },
         "public-encrypt": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-          "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+          "version": "4.0.2",
+          "bundled": true,
           "requires": {
-            "bn.js": "4.11.8",
-            "browserify-rsa": "4.0.1",
-            "create-hash": "1.1.3",
-            "parse-asn1": "5.1.0",
-            "randombytes": "2.0.6"
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1"
           }
         },
         "punycode": {
           "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "bundled": true
         },
         "querystring": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+          "bundled": true
         },
         "querystring-es3": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+          "bundled": true
         },
         "randombytes": {
           "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-          "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "^5.1.0"
           }
         },
         "randomfill": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+          "bundled": true,
           "requires": {
-            "randombytes": "2.0.6",
-            "safe-buffer": "5.1.1"
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
           }
         },
         "readable-stream": {
-          "version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
+          "version": "2.3.6",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.0",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           },
           "dependencies": {
             "inherits": {
               "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "bundled": true
             }
           }
         },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
         "ripemd160": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-          "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+          "version": "2.0.2",
+          "bundled": true,
           "requires": {
-            "hash-base": "2.0.2",
-            "inherits": "2.0.1"
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "version": "5.1.2",
+          "bundled": true
         },
         "sha.js": {
-          "version": "2.4.10",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-          "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+          "version": "2.4.11",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "safe-buffer": "5.1.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         },
         "stream-browserify": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-          "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+          "bundled": true,
           "requires": {
-            "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12"
+            "inherits": "~2.0.1",
+            "readable-stream": "^2.0.2"
           }
         },
         "stream-http": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
-          "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
+          "version": "2.8.1",
+          "bundled": true,
           "requires": {
-            "builtin-status-codes": "3.0.0",
-            "inherits": "2.0.1",
-            "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
-            "to-arraybuffer": "1.0.1",
-            "xtend": "4.0.1"
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.3.3",
+            "to-arraybuffer": "^1.0.0",
+            "xtend": "^4.0.0"
           }
         },
         "string_decoder": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
-          "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
+          "version": "1.1.1",
+          "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         },
         "timers-browserify": {
           "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+          "bundled": true,
           "requires": {
-            "process": "0.11.10"
+            "process": "~0.11.0"
           }
         },
         "to-arraybuffer": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+          "bundled": true
         },
         "tty-browserify": {
           "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-          "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+          "bundled": true
         },
         "url": {
           "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "bundled": true,
           "requires": {
             "punycode": "1.3.2",
             "querystring": "0.2.0"
@@ -1293,41 +1173,31 @@
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+              "bundled": true
             }
           }
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "bundled": true,
           "requires": {
             "inherits": "2.0.1"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+          "bundled": true
         },
         "vm-browserify": {
           "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+          "bundled": true,
           "requires": {
             "indexof": "0.0.1"
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
         "xtend": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+          "bundled": true
         }
       }
     },
@@ -1336,19 +1206,19 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
       "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.4"
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
       }
     },
     "mime": {
@@ -1371,9 +1241,9 @@
       "resolved": "https://registry.npmjs.org/mssql/-/mssql-3.3.0.tgz",
       "integrity": "sha1-tuYzf/Ej6Hv4ruHmyDRLU8pdqFY=",
       "requires": {
-        "generic-pool": "2.5.4",
-        "promise": "7.3.1",
-        "tedious": "1.14.0"
+        "generic-pool": "^2.2.0",
+        "promise": "^7.0.1",
+        "tedious": "~1.14.0"
       }
     },
     "mysql": {
@@ -1397,13 +1267,26 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.0.3",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -1418,7 +1301,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
     "object-assign": {
@@ -1431,8 +1314,8 @@
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
       }
     },
     "parse-glob": {
@@ -1440,10 +1323,10 @@
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
       }
     },
     "path-parse": {
@@ -1466,7 +1349,7 @@
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "requires": {
-        "asap": "2.0.6"
+        "asap": "~2.0.3"
       }
     },
     "punycode": {
@@ -1485,54 +1368,39 @@
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
     "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
       },
       "dependencies": {
         "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "3.2.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "1.1.6"
-              }
-            }
-          }
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
         },
         "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
     "readable-stream": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-      "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.0",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "regenerator-runtime": {
@@ -1545,7 +1413,7 @@
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "requires": {
-        "is-equal-shallow": "0.1.3"
+        "is-equal-shallow": "^0.1.3"
       }
     },
     "remove-trailing-separator": {
@@ -1568,13 +1436,18 @@
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
       "requires": {
-        "path-parse": "1.0.5"
+        "path-parse": "^1.0.5"
       }
     },
     "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sax": {
       "version": "1.2.1",
@@ -1607,11 +1480,11 @@
       "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
     },
     "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
       }
     },
     "stripe": {
@@ -1619,10 +1492,10 @@
       "resolved": "https://registry.npmjs.org/stripe/-/stripe-4.25.0.tgz",
       "integrity": "sha512-sSRPSQ4BTSbdcevVSrtIJzlOCTIAXm8T38DE4zPL6ysYpIWGfIBdo2XnhouLK12/6cuLvaEInlfCZQgoEVzXpQ==",
       "requires": {
-        "bluebird": "2.11.0",
-        "lodash.isplainobject": "4.0.6",
-        "object-assign": "4.1.1",
-        "qs": "6.0.4"
+        "bluebird": "^2.10.2",
+        "lodash.isplainobject": "^4.0.6",
+        "object-assign": "^4.1.0",
+        "qs": "~6.0.4"
       }
     },
     "supports-color": {
@@ -1630,7 +1503,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
       "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "requires": {
-        "has-flag": "3.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "tedious": {
@@ -1638,28 +1511,13 @@
       "resolved": "https://registry.npmjs.org/tedious/-/tedious-1.14.0.tgz",
       "integrity": "sha1-wFwwO4Zoz5HlWmSTt0SGavYZh94=",
       "requires": {
-        "babel-runtime": "5.8.38",
+        "babel-runtime": "^5.8.19",
         "big-number": "0.3.1",
-        "bl": "1.2.1",
-        "iconv-lite": "0.4.19",
-        "readable-stream": "2.3.5",
-        "semver": "5.5.0",
+        "bl": "^1.0.0",
+        "iconv-lite": "^0.4.11",
+        "readable-stream": "^2.0.2",
+        "semver": "^5.1.0",
         "sprintf": "0.1.5"
-      },
-      "dependencies": {
-        "babel-runtime": {
-          "version": "5.8.38",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
-          "integrity": "sha1-HAsC62MxL18If/IEUIJ7QlydTBk=",
-          "requires": {
-            "core-js": "1.2.7"
-          }
-        },
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        }
       }
     },
     "to-fast-properties": {
@@ -1692,16 +1550,16 @@
       "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
     },
     "winston": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz",
-      "integrity": "sha512-k/+Dkzd39ZdyJHYkuaYmf4ff+7j+sCIy73UCOWHYA67/WXU+FF/Y6PF28j+Vy7qNRPHWO+dR+/+zkoQWPimPqg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz",
+      "integrity": "sha512-4S/Ad4ZfSNl8OccCLxnJmNISWcm2joa6Q0YGDxlxMzH0fgSwWsjMt+SmlNwCqdpaPg3ev1HKkMBsIiXeSUwpbA==",
       "requires": {
-        "async": "1.0.0",
-        "colors": "1.0.3",
-        "cycle": "1.0.3",
-        "eyes": "0.1.8",
-        "isstream": "0.1.2",
-        "stack-trace": "0.0.10"
+        "async": "~1.0.0",
+        "colors": "1.0.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "stack-trace": "0.0.x"
       }
     },
     "xml2js": {
@@ -1709,8 +1567,8 @@
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
       "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
       "requires": {
-        "sax": "1.2.1",
-        "xmlbuilder": "4.2.1"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "^4.1.0"
       }
     },
     "xmlbuilder": {
@@ -1718,7 +1576,7 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
       "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
       "requires": {
-        "lodash": "4.17.5"
+        "lodash": "^4.0.0"
       }
     }
   }
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 9cc7137d3f..e1c4559255 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -4,10 +4,10 @@
   "description": "Test app exercising many aspects of the Meteor module system.",
   "private": true,
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
-    "@babel/core": "^7.0.0-beta.46",
-    "@babel/plugin-proposal-do-expressions": "^7.0.0-beta.46",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0-beta.46",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-do-expressions": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0-beta.49",
+    "@babel/runtime": "^7.0.0-beta.49",
     "acorn": "file:imports/links/acorn",
     "aws-sdk": "^2.2.41",
     "cli-color": "^0.2.3",
@@ -15,7 +15,7 @@
     "idle-gc": "^1.0.1",
     "immutable-tuple": "^0.4.4",
     "lodash-es": "^4.17.7",
-    "meteor-node-stubs": "^0.3.2",
+    "meteor-node-stubs": "^0.4.1",
     "moment": "2.11.1",
     "mssql": "^3.1.1",
     "mysql": "^2.15.0",
diff --git a/tools/tests/apps/modules/packages/modules-test-plugin/.npm/package/npm-shrinkwrap.json b/tools/tests/apps/modules/packages/modules-test-plugin/.npm/package/npm-shrinkwrap.json
index 205acd5d77..e3c638b6c3 100644
--- a/tools/tests/apps/modules/packages/modules-test-plugin/.npm/package/npm-shrinkwrap.json
+++ b/tools/tests/apps/modules/packages/modules-test-plugin/.npm/package/npm-shrinkwrap.json
@@ -22,39 +22,54 @@
       "integrity": "sha1-wM5mIMtfLB+xArIPZXQRVcq8REo="
     },
     "babel-runtime": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-      "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs="
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4="
     },
     "babel-types": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz",
-      "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4="
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc="
     },
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz",
+      "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ=="
+    },
+    "de-indent": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
     },
     "esutils": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
     },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
+    },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
     "regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
     "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+    },
+    "vue-template-compiler": {
+      "version": "2.5.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz",
+      "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A=="
     }
   }
 }
diff --git a/tools/tests/apps/modules/packages/modules-test-plugin/package.js b/tools/tests/apps/modules/packages/modules-test-plugin/package.js
index 1d9945130f..3810cecf88 100644
--- a/tools/tests/apps/modules/packages/modules-test-plugin/package.js
+++ b/tools/tests/apps/modules/packages/modules-test-plugin/package.js
@@ -22,7 +22,8 @@ Package.registerBuildPlugin({
 Npm.depends({
   arson: "0.2.3",
   "babel-plugin-transform-class-properties": "6.9.0",
-  "babel-plugin-transform-strict-mode": "6.8.0"
+  "babel-plugin-transform-strict-mode": "6.8.0",
+  "vue-template-compiler": "2.5.16"
 });
 
 Package.onUse(function(api) {
diff --git a/tools/tests/apps/modules/packages/modules-test-plugin/plugin.js b/tools/tests/apps/modules/packages/modules-test-plugin/plugin.js
index 3e889fb270..e9f0d5313a 100644
--- a/tools/tests/apps/modules/packages/modules-test-plugin/plugin.js
+++ b/tools/tests/apps/modules/packages/modules-test-plugin/plugin.js
@@ -21,6 +21,9 @@ class ArsonCompiler {
 
   processFilesForTarget(inputFiles) {
     assert.strictEqual(this.expectedName, "compile-arson");
+    assert.ok(inputFiles.length > 0);
+
+    let vueCheckCount = 0;
 
     inputFiles.forEach(file => {
       const arson = file.require("arson");
@@ -39,6 +42,19 @@ class ArsonCompiler {
         ].join("\n"),
         hash: file.getSourceHash()
       });
+
+      if (file.getPackageName() === "modules-test-plugin") {
+        const vueCompilerId = file.resolve("vue-template-compiler");
+        // Make sure resolution does not use the "browser" field of
+        // vue-template-compiler/package.json.
+        assert.strictEqual(
+          vueCompilerId.split("/").pop(),
+          "index.js"
+        );
+        ++vueCheckCount;
+      }
     });
+
+    assert.ok(vueCheckCount > 0);
   }
 }
diff --git a/tools/tests/apps/package-tests/package.json b/tools/tests/apps/package-tests/package.json
new file mode 100644
index 0000000000..d00187ffd6
--- /dev/null
+++ b/tools/tests/apps/package-tests/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "package-tests",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.0.0-beta.44"
+  }
+}
diff --git a/tools/tests/apps/shell/package.json b/tools/tests/apps/shell/package.json
index b8779eebf9..aae54fb39c 100644
--- a/tools/tests/apps/shell/package.json
+++ b/tools/tests/apps/shell/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "meteor-node-stubs": "^0.4.1"
   }
 }
diff --git a/tools/tests/compiler-plugins.js b/tools/tests/compiler-plugins.js
index 0a29a52d13..d95dc2caf8 100644
--- a/tools/tests/compiler-plugins.js
+++ b/tools/tests/compiler-plugins.js
@@ -53,6 +53,13 @@ selftest.define("compiler plugin caching - coffee", () => {
     '/packages/local-pack/p.coffee'
   ], "web.browser");
 
+  matchRun([
+    '/f1.coffee',
+    '/f2.coffee',
+    '/f3.coffee',
+    '/packages/local-pack/p.coffee'
+  ], "web.browser.legacy");
+
   matchRun([
     '/f1.coffee',
     '/f2.coffee',
@@ -67,6 +74,7 @@ selftest.define("compiler plugin caching - coffee", () => {
 
   // Only recompiles f2.
   matchRun(["/f2.coffee"], "web.browser");
+  matchRun(["/f2.coffee"], "web.browser.legacy");
   matchRun(["/f2.coffee"], osArch);
 
   // Program prints this:
@@ -78,6 +86,7 @@ selftest.define("compiler plugin caching - coffee", () => {
   s.append("packages/local-pack/package.js", "\n// foo\n");
 
   matchRun([], "web.browser");
+  matchRun([], "web.browser.legacy");
   matchRun([], osArch);
 
   run.match("Coffeescript X is 2 Y is 3 FromPackage is 4");
@@ -87,6 +96,7 @@ selftest.define("compiler plugin caching - coffee", () => {
   s.write("packages/local-pack/p.coffee", "FromPackage = 'FromPackage is 5'");
 
   matchRun(["/packages/local-pack/p.coffee"], "web.browser");
+  matchRun(["/packages/local-pack/p.coffee"], "web.browser.legacy");
   matchRun(["/packages/local-pack/p.coffee"], osArch);
 
   run.match("Coffeescript X is 2 Y is 3 FromPackage is 5");
@@ -109,6 +119,7 @@ selftest.define("compiler plugin caching - coffee", () => {
   nextRunOrdinal = 1;
 
   matchRun(["/f2.coffee"], "web.browser");
+  matchRun(["/f2.coffee"], "web.browser.legacy");
   matchRun(["/f2.coffee"], osArch);
 
   run.match('Coffeescript X is 2 Y is edited FromPackage is 5');
@@ -160,6 +171,14 @@ selftest.define("compiler plugin caching - coffee", () => {
       "/top." + extension
     ], "web.browser");
 
+    matchRun([
+      // Though files in imports directories are compiled, they are marked
+      // as lazy so they will not be loaded unless imported.
+      "/imports/dotdot." + extension,
+      "/subdir/nested-root." + extension,
+      "/top." + extension
+    ], "web.browser.legacy");
+
     // There is no render execution in the server program, because it has
     // archMatching:'web'.  We'll see this more clearly when the next call later
     // is "#2" --- we didn't miss a call!
@@ -193,6 +212,7 @@ selftest.define("compiler plugin caching - coffee", () => {
     // preprocessor file in it. This should not require us to render anything.
     s.append("packages/local-pack/package.js", "\n// foo\n");
     matchRun([], "web.browser");
+    matchRun([], "web.browser.legacy");
     run.waitSecs(15);
     run.match("Hello world");
 
@@ -218,6 +238,7 @@ selftest.define("compiler plugin caching - coffee", () => {
             setVariable('el4-style', 'inset'));
     expectedBorderStyles.el4 = 'inset';
     matchRun([`/top.${ extension }`], "web.browser");
+    matchRun([`/top.${ extension }`], "web.browser.legacy");
     run.match("Client modified -- refreshing");
     checkCSS(expectedBorderStyles);
 
@@ -226,6 +247,7 @@ selftest.define("compiler plugin caching - coffee", () => {
             '.el0 { border-style: double; }\n');
     expectedBorderStyles.el0 = 'double';
     matchRun([`/subdir/nested-root.${ extension }`], "web.browser");
+    matchRun([`/subdir/nested-root.${ extension }`], "web.browser.legacy");
     run.match("Client modified -- refreshing");
     checkCSS(expectedBorderStyles);
 
@@ -234,6 +256,7 @@ selftest.define("compiler plugin caching - coffee", () => {
             '.el6 { border-style: solid; }\n');
     expectedBorderStyles.el6 = 'solid';
     matchRun([`/yet-another-root.${ extension }`], "web.browser");
+    matchRun([`/yet-another-root.${ extension }`], "web.browser.legacy");
     run.match("Client modified -- refreshing");
     checkCSS(expectedBorderStyles);
 
@@ -259,6 +282,7 @@ selftest.define("compiler plugin caching - coffee", () => {
     nextRunOrdinal = 1;
 
     matchRun([`/top.${ extension }`], "web.browser");
+    matchRun([`/top.${ extension }`], "web.browser.legacy");
     run.waitSecs(15);
     run.match('Hello world');
     checkCSS(expectedBorderStyles);
@@ -393,6 +417,17 @@ selftest.define("compiler plugins - compiler throws", () => {
   run.expectExit(1);
 });
 
+function checkModernAndLegacyUrls(path, test) {
+  if (! path.startsWith("/")) {
+    path = "/" + path;
+  }
+  test(getUrl("http://localhost:3000" + path));
+  // Asset URLs are no longer prefixed with /__browser.legacy because the
+  // developer has full control over the path where an asset is served, so
+  // there's not much value in serving a legacy version of every asset.
+  // test(getUrl("http://localhost:3000/__browser.legacy" + path));
+}
+
 // Test that compiler plugins can add static assets. Also tests `filenames`
 // option to registerCompiler.
 selftest.define("compiler plugins - compiler addAsset", () => {
@@ -407,8 +442,9 @@ selftest.define("compiler plugins - compiler addAsset", () => {
   run.match("Asset says Print out foo");
 
   // Test client-side asset.
-  const body = getUrl('http://localhost:3000/foo.printme');
-  selftest.expectEqual(body, 'Print out foo\n');
+  checkModernAndLegacyUrls("/foo.printme", body => {
+    selftest.expectEqual(body, "Print out foo\n");
+  });
 
   run.stop();
 });
@@ -416,7 +452,7 @@ selftest.define("compiler plugins - compiler addAsset", () => {
 
 // Test that a package can have a single file that is both source code and an
 // asset
-selftest.skip.define("compiler plugins - addAssets", () => {
+selftest.define("compiler plugins - addAssets", () => {
   const s = new Sandbox({ fakeMongo: true });
 
   s.createApp('myapp', 'compiler-plugin-asset-and-source');
@@ -428,9 +464,14 @@ selftest.skip.define("compiler plugins - addAssets", () => {
   run.match("Printing out my own source code!");
 
   // Test client-side asset.
-  let body = getUrl('http://localhost:3000/packages/' +
-    'asset-and-source/asset-and-source.js');
-  selftest.expectTrue(body.indexOf('Printing out my own source code!') !== -1);
+  checkModernAndLegacyUrls(
+    "/packages/asset-and-source/asset-and-source.js",
+    body => {
+      selftest.expectTrue(
+        body.indexOf("Printing out my own source code!") !== -1
+      );
+    }
+  );
 
   // Test that deprecated API still works (added in 1.2.1 in response to people
   // having trouble upgrading to 1.2)
@@ -450,9 +491,14 @@ selftest.skip.define("compiler plugins - addAssets", () => {
   run.match("Printing out my own source code!");
 
   // Test client-side asset.
-  body = getUrl('http://localhost:3000/packages/' +
-    'asset-and-source/asset-and-source.js');
-  selftest.expectTrue(body.indexOf('Printing out my own source code!') !== -1);
+  checkModernAndLegacyUrls(
+    "/packages/asset-and-source/asset-and-source.js",
+    body => {
+      selftest.expectTrue(
+        body.indexOf('Printing out my own source code!') !== -1
+      );
+    }
+  );
 
   // Test error messages for malformed package files
   s.write("packages/asset-and-source/package.js", `Package.describe({
diff --git a/tools/tests/create.js b/tools/tests/create.js
index cb9e0c74e8..12d87cf9b0 100644
--- a/tools/tests/create.js
+++ b/tools/tests/create.js
@@ -58,3 +58,31 @@ selftest.define("create", function () {
 
   // XXX XXX more more
 });
+
+["bare",
+ "minimal",
+ "full",
+].forEach(template => {
+  selftest.define("create --" + template, function () {
+    const s = new Sandbox;
+
+    // Can we create an app? Yes!
+    let run = s.run("create", "--" + template, template);
+    run.waitSecs(60);
+    run.match("Created a new Meteor app in '" + template + "'.");
+    run.match("To run your new app");
+
+    s.cd(template);
+    run = s.run();
+    run.waitSecs(60);
+    run.match(template);
+    run.match("proxy")
+    run.waitSecs(60);
+    run.match("your app");
+    run.waitSecs(5);
+    run.match("running at");
+    run.match("localhost");
+
+    run.stop();
+  });
+});
diff --git a/tools/tests/modules.js b/tools/tests/modules.js
index 5e1acbed8d..2865a3a0f3 100644
--- a/tools/tests/modules.js
+++ b/tools/tests/modules.js
@@ -11,6 +11,7 @@ function startRun(sandbox) {
   run.match("myapp");
   run.match("proxy");
   run.tellMongo(MONGO_LISTENING);
+  run.waitSecs(20);
   run.match("MongoDB");
   return run;
 };
@@ -82,11 +83,21 @@ selftest.define("modules - import chain for packages", () => {
   run.match("with-main-module: with-main-module");
 
   // On the client, we just check that install() is called correctly
-  const modules = getUrl("http://localhost:3000/packages/modules.js");
-  selftest.expectTrue(modules.includes('\ninstall("with-add-files");'));
-  selftest.expectTrue(modules.includes('\n' +
-    'install("with-main-module", "meteor/with-main-module/with-main-module.js");'
-  ));
+  checkModernAndLegacyUrls("/packages/modules.js", body => {
+    selftest.expectTrue(body.includes('\ninstall("with-add-files");'));
+    selftest.expectTrue(
+      body.includes('\ninstall("with-main-module", ' +
+                    '"meteor/with-main-module/with-main-module.js");')
+    );
+  });
 
   run.stop();
 });
+
+function checkModernAndLegacyUrls(path, test) {
+  if (! path.startsWith("/")) {
+    path = "/" + path;
+  }
+  test(getUrl("http://localhost:3000" + path));
+  test(getUrl("http://localhost:3000/__browser.legacy" + path));
+}
diff --git a/tools/tests/old/app-with-private/package.json b/tools/tests/old/app-with-private/package.json
index 57fe35ac0c..44f909db6c 100644
--- a/tools/tests/old/app-with-private/package.json
+++ b/tools/tests/old/app-with-private/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.46",
-    "meteor-node-stubs": "^0.3.2"
+    "meteor-node-stubs": "^0.4.1"
   }
 }
diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index c66d4fad19..1b815e9c9f 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -79,7 +79,7 @@ var runTest = function () {
                    ["/nested/nested.txt", "Nested\n"]];
   _.each(testCases, function (file) {
     var manifestItem = _.find(clientManifest.manifest, function (m) {
-      return m.url === file[0];
+      return m.url.endsWith(file[0]);
     });
     assert(manifestItem);
     var diskPath = files.pathJoin(tmpOutputDir, "programs", "web.browser",
diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js
index ccf486ff9c..caea34e4fb 100644
--- a/tools/tests/package-tests.js
+++ b/tools/tests/package-tests.js
@@ -190,22 +190,34 @@ selftest.define("add debugOnly and prodOnly packages", [], function () {
   s.cd("myapp");
   s.set("METEOR_OFFLINE_CATALOG", "t");
 
-    // Add a debugOnly package. It should work during a normal run, but print
+  // Add a debugOnly package. It should work during a normal run, but print
   // nothing in production mode.
   run = s.run("add", "debug-only");
+  run.waitSecs(30);
   run.match("debug-only");
   run.expectExit(0);
 
-  s.mkdir("server");
-  s.write("server/exit-test.js",
-          "process.exit(global.DEBUG_ONLY_LOADED ? 234 : 235)");
+  function onStartup(property) {
+    s.mkdir("server");
+    s.write("server/exit-test.js", [
+      "Meteor.startup(() => {",
+      "  console.log('Meteor.isDevelopment', Meteor.isDevelopment);",
+      "  console.log('Meteor.isProduction', Meteor.isProduction);",
+      `  console.log('${property}', global.${property});`,
+      `  process.exit(global.${property} ? 234 : 235);`,
+      "});",
+      ""
+    ].join("\n"));
+  }
+
+  onStartup("DEBUG_ONLY_LOADED");
 
   run = s.run("--once");
-  run.waitSecs(15);
+  run.waitSecs(30);
   run.expectExit(234);
 
   run = s.run("--once", "--production");
-  run.waitSecs(15);
+  run.waitSecs(30);
   run.expectExit(235);
 
   // Add prod-only package, which sets GLOBAL.PROD_ONLY_LOADED.
@@ -213,16 +225,14 @@ selftest.define("add debugOnly and prodOnly packages", [], function () {
   run.match("prod-only");
   run.expectExit(0);
 
-  s.mkdir("server");
-  s.write("server/exit-test.js", // overwrite
-          "process.exit(global.PROD_ONLY_LOADED ? 234 : 235)");
+  onStartup("PROD_ONLY_LOADED");
 
   run = s.run("--once");
-  run.waitSecs(15);
+  run.waitSecs(30);
   run.expectExit(235);
 
   run = s.run("--once", "--production");
-  run.waitSecs(15);
+  run.waitSecs(30);
   run.expectExit(234);
 });
 
@@ -729,8 +739,20 @@ selftest.define("show and search local package",  function () {
     s.cp("package-with-exports.js", "package.js");
   });
 
-  var exportStr =
-    "A, B (server), C (web.browser, web.cordova), D (web.browser), E (web.cordova), G (server, web.cordova)";
+  const impRaw = {
+    A: "",
+    B: "server",
+    C: "web.browser, web.browser.legacy, web.cordova",
+    D: "web.browser, web.browser.legacy",
+    E: "web.cordova",
+    G: "server, web.cordova"
+  };
+
+  const exportStr = Object.keys(impRaw).map(key => {
+    const value = impRaw[key];
+    return key + (value ? " (" + value + ")" : "");
+  }).join(", ");
+
   var description = "Test package.";
 
   testShowPackage(s, name, {
@@ -753,14 +775,6 @@ selftest.define("show and search local package",  function () {
 
   // Test showing implies. Since we are not going to build the package, we don't
   // have to publish any of the things that we imply.
-  var impRaw = {
-    A: "",
-    B: "server",
-    C: "web.browser, web.cordova",
-    D: "web.browser",
-    E: "web.cordova",
-    G: "server, web.cordova"
-  };
   var impliesData = _.sortBy(_.map(impRaw, function (label, placeholder) {
     var name =  randomizedPackageName(username, placeholder.toLowerCase());
     return { placeholder: placeholder, name: name, label: label};
diff --git a/tools/tool-env/install-babel.js b/tools/tool-env/install-babel.js
index fdd0a2452a..f8a26ee7ef 100644
--- a/tools/tool-env/install-babel.js
+++ b/tools/tool-env/install-babel.js
@@ -15,11 +15,10 @@ function babelRegister() {
 
   // Make sure that source maps are included in the generated code for
   // meteor/tools modules.
-  babelOptions.sourceMap = "inline";
-
-  meteorBabel.setCacheDir(cacheDir);
+  babelOptions.sourceMaps = "inline";
 
   require('meteor-babel/register')
+    .setCacheDirectory(cacheDir)
     .allowDirectory(toolsPath)
     .setSourceMapRootPath(meteorPath)
     .setBabelOptions(babelOptions);
diff --git a/tools/tool-testing/sandbox.js b/tools/tool-testing/sandbox.js
index 956f97fdd9..3f13213c27 100644
--- a/tools/tool-testing/sandbox.js
+++ b/tools/tool-testing/sandbox.js
@@ -559,7 +559,8 @@ const ROOT_PACKAGES_TO_BUILD_IN_SANDBOX = [
   "standard-minifier-css",
   "standard-minifier-js",
   "es5-shim",
-  "shell-server"
+  "shell-server",
+  "modern-browsers",
 ];
 
 function newSelfTestCatalog() {
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index ceaaf61969..a7acdf6ee8 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -18,9 +18,6 @@ export { Run };
 
 import "../tool-env/install-runtime.js";
 
-// To allow long stack traces that cross async boundaries
-import 'longjohn';
-
 // Use this to decorate functions that throw TestFailure. Decorate the
 // first function that should not be included in the call stack shown
 // to the user.
diff --git a/tools/upgraders.js b/tools/upgraders.js
index 01d5960eab..322bdfc5dc 100644
--- a/tools/upgraders.js
+++ b/tools/upgraders.js
@@ -291,7 +291,7 @@ be removed if there is no need for the Blaze configuration interface.`,
     packagesFile.writeIfModified();
   },
 
-  '1.6.2-split-underscore-from-meteor-base': function (projectContext) {
+  '1.7-split-underscore-from-meteor-base': function (projectContext) {
     const packagesFile = projectContext.projectConstraintsFile;
     if (! packagesFile.getConstraint(`underscore`) &&
       packagesFile.getConstraint(`meteor-base`)) {
@@ -303,7 +303,7 @@ meteor-base. Since some apps may have been using underscore through this \
 dependency without having it listed in their .meteor/packages files, it has \
 been added automatically. If your app is not using underscore, then you can \
 safely remove it using 'meteor remove underscore'.`,
-        Console.options({ bulletPoint: "1.6.2: " })
+        Console.options({ bulletPoint: "1.7: " })
       );
       packagesFile.addPackages([`underscore`]);
       packagesFile.writeIfModified();
diff --git a/tools/utils/archinfo.js b/tools/utils/archinfo.js
index 47ba49a4f0..a6c634ec79 100644
--- a/tools/utils/archinfo.js
+++ b/tools/utils/archinfo.js
@@ -143,7 +143,7 @@ export const VALID_ARCHITECTURES = {
 //
 // If you change this, also change scripts/admin/launch-meteor
 var _host = null; // memoize
-var host = function () {
+export function host() {
   if (! _host) {
     var run = function (...args) {
       var result = utils.execFileSync(args[0], args.slice(1)).stdout;
@@ -188,7 +188,7 @@ var host = function () {
   }
 
   return _host;
-};
+}
 
 // In order to springboard to earlier Meteor releases that did not have
 // 64-bit Windows builds, Windows installations must be allowed to
@@ -212,7 +212,7 @@ exports.acceptableMeteorToolArches = function () {
 // 64-bit Windows machines that have been using a 32-bit version of Meteor
 // are eligible to switch to 64-bit beginning with Meteor 1.6, which is
 // the first version of Meteor that contains this code.
-exports.canSwitchTo64Bit = function () {
+export function canSwitchTo64Bit() {
   // Automatically switching from 32-bit to 64-bit Windows builds is
   // disabled for the time being, since downloading additional builds of
   // meteor-tool isn't stable enough at the moment (on Windows, at least)
@@ -220,7 +220,7 @@ exports.canSwitchTo64Bit = function () {
   return false &&
     utils.architecture() === "x86_64" &&
     host() === "os.windows.x86_32";
-};
+}
 
 // True if `host` (an architecture name such as 'os.linux.x86_64') can run
 // programs of architecture `program` (which might be something like 'os',
@@ -230,17 +230,17 @@ exports.canSwitchTo64Bit = function () {
 // necessarily have to be a fully qualified architecture name. This
 // function just checks to see if `program` describes a set of
 // environments that is a (non-strict) superset of `host`.
-var matches = function (host, program) {
+export function matches(host, program) {
   return host.substr(0, program.length) === program &&
     (host.length === program.length ||
      host.substr(program.length, 1) === ".");
-};
+}
 
 // Like `supports`, but instead taken an array of possible
 // architectures as its second argument. Returns the most specific
 // match, or null if none match. Throws an error if `programs`
 // contains exact duplicates.
-var mostSpecificMatch = function (host, programs) {
+export function mostSpecificMatch(host, programs) {
   var seen = {};
   var best = null;
 
@@ -249,14 +249,14 @@ var mostSpecificMatch = function (host, programs) {
       throw new Error("Duplicate architecture: " + p);
     }
     seen[p] = true;
-    if (archinfo.matches(host, p) &&
+    if (matches(host, p) &&
         (! best || p.length > best.length)) {
       best = p;
     }
   });
 
   return best;
-};
+}
 
 // `programs` is a set of architectures (as an array of string, which
 // may contain duplicates). Determine if there exists any architecture
@@ -267,7 +267,7 @@ var mostSpecificMatch = function (host, programs) {
 // For example, for 'os' and 'os.osx', return 'os.osx'. For 'os' and
 // 'os.linux.x86_64', return 'os.linux.x86_64'. For 'os' and 'browser', throw an
 // exception.
-var leastSpecificDescription = function (programs) {
+export function leastSpecificDescription(programs) {
   if (programs.length === 0) {
     return '';
   }
@@ -280,27 +280,18 @@ var leastSpecificDescription = function (programs) {
   // compatible with the most specific then it must be the least
   // specific compatible description.
   _.each(programs, function (p) {
-    if (! archinfo.matches(longest, p)) {
+    if (! matches(longest, p)) {
       throw new Error("Incompatible architectures: '" + p + "' and '" +
                       longest + "'");
     }
   });
 
   return longest;
-};
+}
 
-var withoutSpecificOs = function (arch) {
+export function withoutSpecificOs(arch) {
   if (arch.substr(0, 3) === 'os.') {
     return 'os';
   }
   return arch;
-};
-
-var archinfo = exports;
-_.extend(archinfo, {
-  host: host,
-  matches: matches,
-  mostSpecificMatch: mostSpecificMatch,
-  leastSpecificDescription: leastSpecificDescription,
-  withoutSpecificOs: withoutSpecificOs
-});
+}