Merge branch 'master' into snyk-upgrade-7c7c248e49957e539c97a15bb7f7eb58

Author: stoopidJSON

package-lock.json

@@ -50,7 +50,7 @@
     "json2csv": "^5.0.1",
     "jsonwebtoken": "8.5.1",
     "lodash": "^4.17.15",
-    "mocha": "7.1.1",
+    "mocha": "7.1.2",
     "morgan": "1.10.0",
     "nodemailer": "^6.4.6",
     "nodemon": "2.0.3",