Merge branch 'master' into qa

brooketopcoder · brooketopcoder · commit 948def449ce1 · 2022-06-01T11:29:33.000-07:00
diff --git a/package.json b/package.json
@@ -118,4 +118,4 @@
     "node": "10.22.1",
     "npm": "6.14.6"
   }
-}
+}
