diff --git a/lib/legacy/legacy-data-mixin.js b/lib/legacy/legacy-data-mixin.js
index 5aee1e0209..e21e098917 100644
--- a/lib/legacy/legacy-data-mixin.js
+++ b/lib/legacy/legacy-data-mixin.js
@@ -11,6 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 import { Class } from './class.js';
 import { Polymer } from '../../polymer-legacy.js';
 import { dedupingMixin } from '../utils/mixin.js';
+import { templatize } from '../utils/templatize.js';
 
 const UndefinedArgumentError = class extends Error {
   constructor(message, arg) {
@@ -149,5 +150,14 @@ Polymer.Class = (info, mixin) => Class(info,
     LegacyDataMixin(superClass)
 );
 
+// Apply LegacyDataMixin to Templatizer instances as well, and defer
+// runtime switch to the root's host (_methodHost)
+templatize.mixin = 
+  dedupingMixin(superClass => class extends LegacyDataMixin(superClass) {
+    get _legacyUndefinedCheck() {
+      return this._methodHost && this._methodHost._legacyUndefinedCheck;
+    }
+  });
+
 console.info('LegacyDataMixin will be applied to all legacy elements.\n' +
               'Set `_legacyUndefinedCheck: true` on element class to enable.');
diff --git a/lib/utils/templatize.js b/lib/utils/templatize.js
index a28bae35c6..14b5eeb6fe 100644
--- a/lib/utils/templatize.js
+++ b/lib/utils/templatize.js
@@ -334,6 +334,10 @@ function createTemplatizerClass(template, templateInfo, options) {
   // Anonymous class created by the templatize
   let base = options.mutableData ?
     MutableTemplateInstanceBase : TemplateInstanceBase;
+    // Affordance for global mixins onto TemplatizeInstance
+    if (templatize.mixin) {
+      base = templatize.mixin(base);
+    }
   /**
    * @constructor
    * @extends {base}
diff --git a/package-lock.json b/package-lock.json
index a3033171fc..f242ddaffe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1580,7 +1580,7 @@
       "dependencies": {
         "@types/doctrine": {
           "version": "0.0.3",
-          "resolved": "http://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
           "integrity": "sha1-6JLSk8ksnB0/mvcsFaVU+8fgiVo=",
           "dev": true
         },
@@ -1960,7 +1960,7 @@
     },
     "@types/clean-css": {
       "version": "3.4.30",
-      "resolved": "http://registry.npmjs.org/@types/clean-css/-/clean-css-3.4.30.tgz",
+      "resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-3.4.30.tgz",
       "integrity": "sha1-AFLBNvUkgAJCjjY4s33ko5gYZB0=",
       "dev": true
     },
@@ -2002,7 +2002,7 @@
     },
     "@types/events": {
       "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
       "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
       "dev": true
     },
@@ -2048,7 +2048,7 @@
     },
     "@types/html-minifier": {
       "version": "3.5.2",
-      "resolved": "http://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.2.tgz",
       "integrity": "sha512-yikK28/KlVyf8g9i/k+TDFlteLuZ6QQTUdVqvKtzEB+8DSLCTjxfh6IK45KnW4rYFI3Y8T4LWpYJMTmfJleWaQ==",
       "dev": true,
       "requires": {
@@ -2107,7 +2107,7 @@
     },
     "@types/relateurl": {
       "version": "0.2.28",
-      "resolved": "http://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz",
+      "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz",
       "integrity": "sha1-a9p9uGU/piZD9e5p6facEaOS46Y=",
       "dev": true
     },
@@ -3410,7 +3410,7 @@
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
@@ -3451,7 +3451,7 @@
     },
     "chai": {
       "version": "3.5.0",
-      "resolved": "http://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
       "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
       "dev": true,
       "requires": {
@@ -3939,7 +3939,7 @@
     },
     "deep-eql": {
       "version": "0.1.3",
-      "resolved": "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
       "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
       "dev": true,
       "requires": {
@@ -4113,7 +4113,7 @@
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
           "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
           "dev": true
         }
@@ -4141,7 +4141,7 @@
     },
     "domelementtype": {
       "version": "1.3.0",
-      "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
       "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
       "dev": true
     },
@@ -5558,7 +5558,7 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
@@ -5761,7 +5761,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -6697,7 +6697,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -7223,7 +7223,7 @@
     },
     "lolex": {
       "version": "1.3.2",
-      "resolved": "http://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
       "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
       "dev": true
     },
@@ -7270,7 +7270,7 @@
     },
     "magic-string": {
       "version": "0.22.5",
-      "resolved": "http://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
       "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
       "dev": true,
       "requires": {
@@ -7351,7 +7351,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
@@ -7369,7 +7369,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -7487,7 +7487,7 @@
       "dependencies": {
         "commander": {
           "version": "2.9.0",
-          "resolved": "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
           "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
           "dev": true,
           "requires": {
@@ -8240,7 +8240,7 @@
       "dependencies": {
         "@types/resolve": {
           "version": "0.0.7",
-          "resolved": "http://registry.npmjs.org/@types/resolve/-/resolve-0.0.7.tgz",
+          "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.7.tgz",
           "integrity": "sha512-GPewdjkb0Q76o459qgp6pBLzJj/bD3oveS2kfLhIkZ9U3t3AFKtl5DlFB6lGTw0iZmcmxoGC8lpLW3NNJKrN9A==",
           "dev": true,
           "requires": {
@@ -8401,25 +8401,25 @@
         },
         "babel-plugin-transform-member-expression-literals": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-Jy69Ki1DQbhsJNzYQ3SuWqNwKHQ=",
           "dev": true
         },
         "babel-plugin-transform-merge-sibling-variables": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-SKMw0oKT4xjQcXXCYMdIWec5i0M=",
           "dev": true
         },
         "babel-plugin-transform-minify-booleans": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-He72nCITUDipHeH10T11njRkxDw=",
           "dev": true
         },
         "babel-plugin-transform-property-literals": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-NxJ6qgQSXD0Iv5XNtajx0uRMpFM=",
           "dev": true,
           "requires": {
@@ -8434,13 +8434,13 @@
         },
         "babel-plugin-transform-remove-console": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-xXF6+fdpGLKCHPrvRNgkXU6pQiw=",
           "dev": true
         },
         "babel-plugin-transform-remove-debugger": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-H8NcKcfAh4zzDlWKczZRkG6IjkQ=",
           "dev": true
         },
@@ -8455,19 +8455,19 @@
         },
         "babel-plugin-transform-simplify-comparison-operators": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-9UmabcPtaGvaUzY4ZrZ92ndMW+0=",
           "dev": true
         },
         "babel-plugin-transform-undefined-to-void": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-F1oaMJDmFkA/jIGc3Ooa7LZlI7I=",
           "dev": true
         },
         "babel-preset-minify": {
           "version": "0.4.0-alpha.caaefb4c",
-          "resolved": "http://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.4.0-alpha.caaefb4c.tgz",
+          "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.4.0-alpha.caaefb4c.tgz",
           "integrity": "sha1-pQUsWVXdl9JGmbKB/amjAuqMGHE=",
           "dev": true,
           "requires": {
@@ -8571,7 +8571,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "requires": {
@@ -10151,7 +10151,7 @@
         },
         "@polymer/test-fixture": {
           "version": "0.0.3",
-          "resolved": "http://registry.npmjs.org/@polymer/test-fixture/-/test-fixture-0.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/@polymer/test-fixture/-/test-fixture-0.0.3.tgz",
           "integrity": "sha1-REN1JpfU2Sk7vEEuoLXk00HxSdk=",
           "dev": true
         },
@@ -10243,19 +10243,19 @@
         },
         "@types/clean-css": {
           "version": "3.4.30",
-          "resolved": "http://registry.npmjs.org/@types/clean-css/-/clean-css-3.4.30.tgz",
+          "resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-3.4.30.tgz",
           "integrity": "sha1-AFLBNvUkgAJCjjY4s33ko5gYZB0=",
           "dev": true
         },
         "@types/clone": {
           "version": "0.1.30",
-          "resolved": "http://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
+          "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
           "integrity": "sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=",
           "dev": true
         },
         "@types/compression": {
           "version": "0.0.33",
-          "resolved": "http://registry.npmjs.org/@types/compression/-/compression-0.0.33.tgz",
+          "resolved": "https://registry.npmjs.org/@types/compression/-/compression-0.0.33.tgz",
           "integrity": "sha1-ldxzOiM5qoRjgdfxN3eS0lU9wn0=",
           "dev": true,
           "requires": {
@@ -10287,13 +10287,13 @@
         },
         "@types/cssbeautify": {
           "version": "0.3.1",
-          "resolved": "http://registry.npmjs.org/@types/cssbeautify/-/cssbeautify-0.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/@types/cssbeautify/-/cssbeautify-0.3.1.tgz",
           "integrity": "sha1-jgvuj33suVIlDaDK6+BeMFkcF+8=",
           "dev": true
         },
         "@types/del": {
           "version": "3.0.1",
-          "resolved": "http://registry.npmjs.org/@types/del/-/del-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/@types/del/-/del-3.0.1.tgz",
           "integrity": "sha512-y6qRq6raBuu965clKgx6FHuiPu3oHdtmzMPXi8Uahsjdq1L6DL5fS/aY5/s71YwM7k6K1QIWvem5vNwlnNGIkQ==",
           "dev": true,
           "requires": {
@@ -10302,7 +10302,7 @@
         },
         "@types/doctrine": {
           "version": "0.0.1",
-          "resolved": "http://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.1.tgz",
           "integrity": "sha1-uZny2fe0PKvgoaLzm8IDvH3K2p0=",
           "dev": true
         },
@@ -10319,7 +10319,7 @@
         },
         "@types/events": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
           "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
           "dev": true
         },
@@ -10355,13 +10355,13 @@
         },
         "@types/fast-levenshtein": {
           "version": "0.0.1",
-          "resolved": "http://registry.npmjs.org/@types/fast-levenshtein/-/fast-levenshtein-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/@types/fast-levenshtein/-/fast-levenshtein-0.0.1.tgz",
           "integrity": "sha1-OjYVzxc2Rcj8pY0FHk4ygk5L0oY=",
           "dev": true
         },
         "@types/findup-sync": {
           "version": "0.3.29",
-          "resolved": "http://registry.npmjs.org/@types/findup-sync/-/findup-sync-0.3.29.tgz",
+          "resolved": "https://registry.npmjs.org/@types/findup-sync/-/findup-sync-0.3.29.tgz",
           "integrity": "sha1-7AyAWX5e0VcoIgfnYspyVMrVdjI=",
           "dev": true,
           "requires": {
@@ -10458,7 +10458,7 @@
         },
         "@types/html-minifier": {
           "version": "3.5.2",
-          "resolved": "http://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.2.tgz",
           "integrity": "sha512-yikK28/KlVyf8g9i/k+TDFlteLuZ6QQTUdVqvKtzEB+8DSLCTjxfh6IK45KnW4rYFI3Y8T4LWpYJMTmfJleWaQ==",
           "dev": true,
           "requires": {
@@ -10469,7 +10469,7 @@
         },
         "@types/inquirer": {
           "version": "0.0.32",
-          "resolved": "http://registry.npmjs.org/@types/inquirer/-/inquirer-0.0.32.tgz",
+          "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-0.0.32.tgz",
           "integrity": "sha1-pKCOg3QcUAp8PI53dgFPf4plhw0=",
           "dev": true,
           "requires": {
@@ -10479,7 +10479,7 @@
         },
         "@types/is-windows": {
           "version": "0.2.0",
-          "resolved": "http://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz",
           "integrity": "sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8=",
           "dev": true
         },
@@ -10538,7 +10538,7 @@
         },
         "@types/opn": {
           "version": "3.0.28",
-          "resolved": "http://registry.npmjs.org/@types/opn/-/opn-3.0.28.tgz",
+          "resolved": "https://registry.npmjs.org/@types/opn/-/opn-3.0.28.tgz",
           "integrity": "sha1-CX0NHJtXSVc6XZbfEyOHu20CEYo=",
           "dev": true,
           "requires": {
@@ -10555,7 +10555,7 @@
         },
         "@types/parse5": {
           "version": "2.2.34",
-          "resolved": "http://registry.npmjs.org/@types/parse5/-/parse5-2.2.34.tgz",
+          "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-2.2.34.tgz",
           "integrity": "sha1-44cKEOgnNacg9i1x3NGDunjvOp0=",
           "dev": true,
           "requires": {
@@ -10572,7 +10572,7 @@
         },
         "@types/path-is-inside": {
           "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/@types/path-is-inside/-/path-is-inside-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/@types/path-is-inside/-/path-is-inside-1.0.0.tgz",
           "integrity": "sha512-hfnXRGugz+McgX2jxyy5qz9sB21LRzlGn24zlwN2KEgoPtEvjzNRrLtUkOOebPDPZl3Rq7ywKxYvylVcEZDnEw==",
           "dev": true
         },
@@ -10584,7 +10584,7 @@
         },
         "@types/relateurl": {
           "version": "0.2.28",
-          "resolved": "http://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz",
+          "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz",
           "integrity": "sha1-a9p9uGU/piZD9e5p6facEaOS46Y=",
           "dev": true
         },
@@ -10608,7 +10608,7 @@
         },
         "@types/resolve": {
           "version": "0.0.4",
-          "resolved": "http://registry.npmjs.org/@types/resolve/-/resolve-0.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.4.tgz",
           "integrity": "sha1-m1htZalH3qiMS8JNoLkF/pUgoNU=",
           "dev": true,
           "requires": {
@@ -10625,13 +10625,13 @@
         },
         "@types/rimraf": {
           "version": "0.0.28",
-          "resolved": "http://registry.npmjs.org/@types/rimraf/-/rimraf-0.0.28.tgz",
+          "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-0.0.28.tgz",
           "integrity": "sha1-VWJRm8eWPKyoq/fxKMrjtZTUHQY=",
           "dev": true
         },
         "@types/rx": {
           "version": "4.1.1",
-          "resolved": "http://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz",
           "integrity": "sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=",
           "dev": true,
           "requires": {
@@ -10887,7 +10887,7 @@
         },
         "@types/vinyl-fs": {
           "version": "0.0.28",
-          "resolved": "http://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-0.0.28.tgz",
+          "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-0.0.28.tgz",
           "integrity": "sha1-RmMBe8gCxlcOrk80Cf1cq/l8v94=",
           "dev": true,
           "requires": {
@@ -10906,7 +10906,7 @@
         },
         "@types/whatwg-url": {
           "version": "6.4.0",
-          "resolved": "http://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-6.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-6.4.0.tgz",
           "integrity": "sha512-tonhlcbQ2eho09am6RHnHOgvtDfDYINd5rgxD+2YSkKENooVCFsWizJz139MQW/PV8FfClyKrNe9ZbdHrSCxGg==",
           "dev": true,
           "requires": {
@@ -10946,7 +10946,7 @@
         },
         "@types/yeoman-generator": {
           "version": "2.0.3",
-          "resolved": "http://registry.npmjs.org/@types/yeoman-generator/-/yeoman-generator-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/@types/yeoman-generator/-/yeoman-generator-2.0.3.tgz",
           "integrity": "sha512-vch2UFd6k7DdfWEv/alRwZIRXQoxZNUDpfLOK24+005dzE1HVnwSWfETF3WxJnWlsOcH87wU4uzldAE/7F/6Lw==",
           "dev": true,
           "requires": {
@@ -10991,7 +10991,7 @@
         },
         "acorn-jsx": {
           "version": "3.0.1",
-          "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
           "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
           "dev": true,
           "requires": {
@@ -11000,7 +11000,7 @@
           "dependencies": {
             "acorn": {
               "version": "3.3.0",
-              "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
               "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
               "dev": true
             }
@@ -11031,7 +11031,7 @@
           "dependencies": {
             "semver": {
               "version": "5.0.3",
-              "resolved": "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
               "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
               "dev": true
             }
@@ -11291,7 +11291,7 @@
         },
         "async": {
           "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
           "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
           "dev": true
         },
@@ -11388,7 +11388,7 @@
         },
         "babel-helper-is-nodes-equiv": {
           "version": "0.0.1",
-          "resolved": "http://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
           "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=",
           "dev": true
         },
@@ -11528,25 +11528,25 @@
         },
         "babel-plugin-transform-member-expression-literals": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-Jy69Ki1DQbhsJNzYQ3SuWqNwKHQ=",
           "dev": true
         },
         "babel-plugin-transform-merge-sibling-variables": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-SKMw0oKT4xjQcXXCYMdIWec5i0M=",
           "dev": true
         },
         "babel-plugin-transform-minify-booleans": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-He72nCITUDipHeH10T11njRkxDw=",
           "dev": true
         },
         "babel-plugin-transform-property-literals": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-NxJ6qgQSXD0Iv5XNtajx0uRMpFM=",
           "dev": true,
           "requires": {
@@ -11561,13 +11561,13 @@
         },
         "babel-plugin-transform-remove-console": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-xXF6+fdpGLKCHPrvRNgkXU6pQiw=",
           "dev": true
         },
         "babel-plugin-transform-remove-debugger": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-H8NcKcfAh4zzDlWKczZRkG6IjkQ=",
           "dev": true
         },
@@ -11582,19 +11582,19 @@
         },
         "babel-plugin-transform-simplify-comparison-operators": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-9UmabcPtaGvaUzY4ZrZ92ndMW+0=",
           "dev": true
         },
         "babel-plugin-transform-undefined-to-void": {
           "version": "6.10.0-alpha.f95869d4",
-          "resolved": "http://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.10.0-alpha.f95869d4.tgz",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.10.0-alpha.f95869d4.tgz",
           "integrity": "sha1-F1oaMJDmFkA/jIGc3Ooa7LZlI7I=",
           "dev": true
         },
         "babel-preset-minify": {
           "version": "0.4.0-alpha.caaefb4c",
-          "resolved": "http://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.4.0-alpha.caaefb4c.tgz",
+          "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.4.0-alpha.caaefb4c.tgz",
           "integrity": "sha1-pQUsWVXdl9JGmbKB/amjAuqMGHE=",
           "dev": true,
           "requires": {
@@ -11818,7 +11818,7 @@
         },
         "bl": {
           "version": "1.2.2",
-          "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
           "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
           "dev": true,
           "requires": {
@@ -11828,7 +11828,7 @@
         },
         "blob": {
           "version": "0.0.4",
-          "resolved": "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
           "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
           "dev": true
         },
@@ -12141,7 +12141,7 @@
             },
             "readable-stream": {
               "version": "1.1.14",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
               "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
               "dev": true,
               "requires": {
@@ -12220,7 +12220,7 @@
         },
         "camelcase-keys": {
           "version": "2.1.0",
-          "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
           "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
           "dev": true,
           "requires": {
@@ -12230,7 +12230,7 @@
         },
         "cancel-token": {
           "version": "0.1.1",
-          "resolved": "http://registry.npmjs.org/cancel-token/-/cancel-token-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/cancel-token/-/cancel-token-0.1.1.tgz",
           "integrity": "sha1-wYGXZ0uxyEwdaTPr8V2NWlznm08=",
           "dev": true,
           "requires": {
@@ -12259,7 +12259,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -12364,7 +12364,7 @@
         },
         "cleankill": {
           "version": "2.0.0",
-          "resolved": "http://registry.npmjs.org/cleankill/-/cleankill-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/cleankill/-/cleankill-2.0.0.tgz",
           "integrity": "sha1-WYMN/ItBHVPccq0J1Fp46jMWGpE=",
           "dev": true
         },
@@ -12978,7 +12978,7 @@
               "dependencies": {
                 "pify": {
                   "version": "2.3.0",
-                  "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                   "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
                   "dev": true
                 }
@@ -13058,7 +13058,7 @@
             },
             "readable-stream": {
               "version": "1.1.14",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
               "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
               "dev": true,
               "requires": {
@@ -13341,7 +13341,7 @@
         },
         "espree": {
           "version": "3.5.4",
-          "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
           "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
           "dev": true,
           "requires": {
@@ -13544,7 +13544,7 @@
         },
         "external-editor": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz",
           "integrity": "sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=",
           "dev": true,
           "requires": {
@@ -13981,7 +13981,7 @@
         },
         "finalhandler": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
           "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
           "dev": true,
           "requires": {
@@ -14005,7 +14005,7 @@
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
               "dev": true
             }
@@ -14051,7 +14051,7 @@
         },
         "follow-redirects": {
           "version": "0.0.7",
-          "resolved": "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz",
           "integrity": "sha1-NLkLqyqRGqNHVx2pDyK9NuzYqRk=",
           "dev": true,
           "requires": {
@@ -14759,7 +14759,7 @@
         },
         "get-stream": {
           "version": "3.0.0",
-          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
@@ -14928,7 +14928,7 @@
             },
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "requires": {
@@ -15040,7 +15040,7 @@
         },
         "got": {
           "version": "6.7.1",
-          "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
+          "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
           "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
           "dev": true,
           "requires": {
@@ -15344,7 +15344,7 @@
         },
         "http-errors": {
           "version": "1.6.3",
-          "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
           "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
           "dev": true,
           "requires": {
@@ -15506,7 +15506,7 @@
         },
         "inquirer": {
           "version": "1.2.3",
-          "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz",
           "integrity": "sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=",
           "dev": true,
           "requires": {
@@ -15585,7 +15585,7 @@
         },
         "is-builtin-module": {
           "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
           "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
           "dev": true,
           "requires": {
@@ -15722,7 +15722,7 @@
         },
         "is-obj": {
           "version": "1.0.1",
-          "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
           "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
           "dev": true
         },
@@ -15983,7 +15983,7 @@
         },
         "json5": {
           "version": "0.5.1",
-          "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
           "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
           "dev": true
         },
@@ -16080,7 +16080,7 @@
         },
         "load-json-file": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
           "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
           "dev": true,
           "requires": {
@@ -16287,7 +16287,7 @@
         },
         "magic-string": {
           "version": "0.22.5",
-          "resolved": "http://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
           "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
           "dev": true,
           "requires": {
@@ -16360,7 +16360,7 @@
         },
         "media-typer": {
           "version": "0.3.0",
-          "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
           "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
           "dev": true
         },
@@ -16430,7 +16430,7 @@
         },
         "meow": {
           "version": "3.7.0",
-          "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
           "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
           "dev": true,
           "requires": {
@@ -16552,7 +16552,7 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
@@ -16579,7 +16579,7 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "requires": {
             "minimist": "0.0.8"
@@ -16844,7 +16844,7 @@
             },
             "chalk": {
               "version": "0.4.0",
-              "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
               "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
               "dev": true,
               "requires": {
@@ -16855,7 +16855,7 @@
             },
             "strip-ansi": {
               "version": "0.1.1",
-              "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
               "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
               "dev": true
             }
@@ -17017,7 +17017,7 @@
         },
         "opn": {
           "version": "3.0.3",
-          "resolved": "http://registry.npmjs.org/opn/-/opn-3.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz",
           "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=",
           "dev": true,
           "requires": {
@@ -17036,7 +17036,7 @@
           "dependencies": {
             "minimist": {
               "version": "0.0.10",
-              "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
               "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
               "dev": true
             }
@@ -17330,7 +17330,7 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
@@ -17535,7 +17535,7 @@
             },
             "@types/resolve": {
               "version": "0.0.7",
-              "resolved": "http://registry.npmjs.org/@types/resolve/-/resolve-0.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.7.tgz",
               "integrity": "sha512-GPewdjkb0Q76o459qgp6pBLzJj/bD3oveS2kfLhIkZ9U3t3AFKtl5DlFB6lGTw0iZmcmxoGC8lpLW3NNJKrN9A==",
               "dev": true,
               "requires": {
@@ -17731,7 +17731,7 @@
           "dependencies": {
             "@types/mz": {
               "version": "0.0.29",
-              "resolved": "http://registry.npmjs.org/@types/mz/-/mz-0.0.29.tgz",
+              "resolved": "https://registry.npmjs.org/@types/mz/-/mz-0.0.29.tgz",
               "integrity": "sha1-vCRyjGSZc/HHhR6QM/nOUlZowns=",
               "dev": true,
               "requires": {
@@ -17998,7 +17998,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -19422,7 +19422,7 @@
         },
         "stacky": {
           "version": "1.3.1",
-          "resolved": "http://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
           "integrity": "sha1-PxF+UYe5pz0j+HbWnwXIWxGAShI=",
           "dev": true,
           "requires": {
@@ -19432,7 +19432,7 @@
           "dependencies": {
             "lodash": {
               "version": "3.10.1",
-              "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
               "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
               "dev": true
             }
@@ -19526,7 +19526,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -19733,7 +19733,7 @@
           "dependencies": {
             "rimraf": {
               "version": "2.2.8",
-              "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
               "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
               "dev": true
             }
@@ -19772,7 +19772,7 @@
         },
         "text-encoding": {
           "version": "0.6.4",
-          "resolved": "http://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+          "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
           "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
           "dev": true
         },
@@ -19808,7 +19808,7 @@
         },
         "through": {
           "version": "2.3.8",
-          "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
           "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
           "dev": true
         },
@@ -20195,7 +20195,7 @@
         },
         "update-notifier": {
           "version": "1.0.3",
-          "resolved": "http://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
           "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=",
           "dev": true,
           "requires": {
@@ -20220,7 +20220,7 @@
             },
             "boxen": {
               "version": "0.6.0",
-              "resolved": "http://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
               "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
               "dev": true,
               "requires": {
@@ -20263,7 +20263,7 @@
             },
             "got": {
               "version": "5.7.1",
-              "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
+              "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
               "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
               "dev": true,
               "requires": {
@@ -20295,7 +20295,7 @@
             },
             "package-json": {
               "version": "2.4.0",
-              "resolved": "http://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
+              "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
               "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
               "dev": true,
               "requires": {
@@ -20319,13 +20319,13 @@
             },
             "uuid": {
               "version": "2.0.3",
-              "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
               "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
               "dev": true
             },
             "widest-line": {
               "version": "1.0.0",
-              "resolved": "http://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
               "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
               "dev": true,
               "requires": {
@@ -20711,7 +20711,7 @@
           "dependencies": {
             "async": {
               "version": "2.0.1",
-              "resolved": "http://registry.npmjs.org/async/-/async-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz",
               "integrity": "sha1-twnMAoCpw28J9FNr6CPIOKkEniU=",
               "dev": true,
               "requires": {
@@ -20754,7 +20754,7 @@
             },
             "request": {
               "version": "2.85.0",
-              "resolved": "http://registry.npmjs.org/request/-/request-2.85.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
               "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
               "dev": true,
               "requires": {
@@ -21235,7 +21235,7 @@
             },
             "lodash": {
               "version": "3.10.1",
-              "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
               "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
               "dev": true
             },
@@ -21268,7 +21268,7 @@
             },
             "ms": {
               "version": "0.7.0",
-              "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
               "integrity": "sha1-hlvpTC5zl62KV9pqYzpuLzB5i4M=",
               "dev": true
             },
@@ -21317,7 +21317,7 @@
               "dependencies": {
                 "debug": {
                   "version": "2.1.3",
-                  "resolved": "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
                   "integrity": "sha1-zoqxte6PvuK/o7Yzyrk9NmtjQY4=",
                   "dev": true,
                   "requires": {
@@ -21520,7 +21520,7 @@
         },
         "xmlbuilder": {
           "version": "8.2.2",
-          "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
           "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
           "dev": true,
           "optional": true
@@ -22191,7 +22191,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -22740,7 +22740,7 @@
     },
     "sinon": {
       "version": "1.17.7",
-      "resolved": "http://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
       "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
       "dev": true,
       "requires": {
@@ -23010,7 +23010,7 @@
     },
     "stacky": {
       "version": "1.3.1",
-      "resolved": "http://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
       "integrity": "sha1-PxF+UYe5pz0j+HbWnwXIWxGAShI=",
       "dev": true,
       "requires": {
@@ -23020,7 +23020,7 @@
       "dependencies": {
         "lodash": {
           "version": "3.10.1",
-          "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
         }
@@ -24032,13 +24032,13 @@
       "dependencies": {
         "async": {
           "version": "1.5.2",
-          "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "dev": true
         },
         "lodash": {
           "version": "3.10.1",
-          "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
         }
diff --git a/test/unit/legacy-data.html b/test/unit/legacy-data.html
index 3747c9f561..353efd1269 100644
--- a/test/unit/legacy-data.html
+++ b/test/unit/legacy-data.html
@@ -24,6 +24,9 @@
       <div id="child"
         computed-single="[[computeSingle(inlineSingleDep)]]"
         computed-multi="[[computeMulti(inlineMultiDep1, inlineMultiDep2)]]">
+        <dom-if if>
+          <template><div id="ifChild" computed-multi="[[computeMulti(inlineMultiIfDep1, inlineMultiIfDep2)]]"></div></template>
+        </dom-if>
       </div>
     </template>
     <script type="module">
@@ -41,6 +44,8 @@
           inlineSingleDep: String,
           inlineMultiDep1: String,
           inlineMultiDep2: String,
+          inlineMultiIfDep1: String,
+          inlineMultiIfDep2: String,
           computedSingle: {
             computed: 'computeSingle(computedSingleDep)'
           },
@@ -128,8 +133,20 @@
     </template>
   </test-fixture>
 
-  <script>
-  (function() {
+  <test-fixture id="declarative-multi-if-one-computed-inline">
+    <template>
+      <x-data inline-multi-if-dep1="b"></x-data>
+    </template>
+  </test-fixture>
+
+  <test-fixture id="declarative-multi-if-all-computed-inline">
+    <template>
+      <x-data inline-multi-if-dep1="b" inline-multi-if-dep2="c"></x-data>
+    </template>
+  </test-fixture>
+
+  <script type="module">
+    import {flush} from '../../lib/utils/flush.js';
 
     let el;
 
@@ -156,6 +173,7 @@
         el._legacyUndefinedCheck = check;
         Object.assign(el, props);
         document.body.appendChild(el);
+        flush();
       }
 
       teardown(() => {
@@ -172,6 +190,8 @@
       const inlineSingleDep = 'inlineSingleDep';
       const inlineMultiDep1 = 'inlineMultiDep1';
       const inlineMultiDep2 = 'inlineMultiDep2';
+      const inlineMultiIfDep1 = 'inlineMultiIfDep1';
+      const inlineMultiIfDep2 = 'inlineMultiIfDep2';
 
       suite('check disabled', () => {
         test('no arguments defined', () => {
@@ -240,6 +260,16 @@
           assertEffects({computeMulti: 1});
           assert.equal(el.$.child.computedMulti, '[inlineMultiDep1,inlineMultiDep2]');
         });
+        test('one inline computeMulti argument defined in dom-if', () => {
+          setupElement(false, {inlineMultiIfDep1});
+          assertEffects({computeMulti: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, '[inlineMultiIfDep1,undefined]');
+        });
+        test('all inline computeMulti argument defined in dom-if', () => {
+          setupElement(false, {inlineMultiIfDep1, inlineMultiIfDep2});
+          assertEffects({computeMulti: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, '[inlineMultiIfDep1,inlineMultiIfDep2]');
+        });
       });
 
       suite('warn', () => {
@@ -309,6 +339,16 @@
           assertEffects({computeMulti: 1});
           assert.equal(el.$.child.computedMulti, '[inlineMultiDep1,inlineMultiDep2]');
         });
+        test('one inline computeMulti argument defined in dom-if', () => {
+          setupElement(true, {inlineMultiIfDep1});
+          assertEffects({warn: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, undefined);
+        });
+        test('all inline computeMulti argument defined in dom-if', () => {
+          setupElement(true, {inlineMultiIfDep1, inlineMultiIfDep2});
+          assertEffects({computeMulti: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, '[inlineMultiIfDep1,inlineMultiIfDep2]');
+        });
       });
     });
 
@@ -361,8 +401,21 @@
         });
         test('inline all computeMulti defined', () => {
           el = fixture('declarative-multi-all-computed-inline');
+          assertEffects({computeMulti: 1});
           assert.equal(el.$.child.computedMulti, '[b,c]');
         });
+        test('one inline computeMulti argument defined in dom-if', () => {
+          el = fixture('declarative-multi-if-one-computed-inline');
+          flush();
+          assertEffects({computeMulti: 0, warn: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, undefined);
+        });
+        test('all inline computeMulti argument defined in dom-if', () => {
+          el = fixture('declarative-multi-if-all-computed-inline');
+          flush();
+          assertEffects({computeMulti: 1});
+          assert.equal(el.$$('#ifChild').computedMulti, '[b,c]');
+        });
       });
     });
 
@@ -377,7 +430,6 @@
       });
     });
     
-  })();
   </script>
 </body>
 </html>