Merge branch 'master' into dev

package.json

@@ -36,7 +36,7 @@
         "cors": "2.8.5",
         "cron": "1.7.1",
         "denque": "1.4.1",
-        "express": "4.17.0",
+        "express": "4.17.1",
         "express-session": "1.16.1",
         "fs-extra": "8.0.1",
         "fs.notify": "0.0.4",
@@ -48,8 +48,9 @@
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.6.4",
+        "media-typer": "1.1.0",
         "memorystore": "1.6.1",
-        "mime": "2.4.3",
+        "mime": "2.4.4",
         "mqtt": "2.18.8",
         "multer": "1.4.1",
         "mustache": "3.0.1",
@@ -67,8 +68,8 @@
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.4.0",
         "request": "2.88.0",
-        "semver": "6.0.0",
-        "uglify-js": "3.5.15",
+        "semver": "6.1.1",
+        "uglify-js": "3.6.0",
         "when": "3.7.8",
         "ws": "6.2.1",
         "xml2js": "0.4.19"