Merge branch 'master' into mfa-meta

diff --cc package-lock.json
index 7440f1d2f980a7026879451ea22f6c1d0c2a1a38,222da74e3751f62cbdbece40b8f82de2438597cd..3de9b644834078502da1ce956cd0dd69978e3555
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -1027,13 -1364,11 +1365,16 @@@
        "version": "2.1.1",
        "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
        "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-       "dev": true
+       "dev": true,
+       "engines": {
+         "node": ">=6"
+       }
      },
 +    "node_modules/qr-creator": {
 +      "version": "1.0.0",
 +      "resolved": "https://registry.npmjs.org/qr-creator/-/qr-creator-1.0.0.tgz",
 +      "integrity": "sha512-C0cqfbS1P5hfqN4NhsYsUXePlk9BO+a45bAQ3xLYjBL3bOIFzoVEjs79Fado9u9BPBD3buHi3+vY+C8tHh4qMQ=="
 +    },
      "node_modules/regexpp": {
        "version": "3.1.0",
        "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",