Merge branch 'master' into wip/2.2.0

# Conflicts:
#	package.json

Author: Sv443

package-lock.json

@@ -68,7 +68,7 @@
     "request-ip": "^2.1.3",
     "svjsl": "^1.9.4",
     "url-parse": "^1.4.7",
-    "xss": "^1.0.7"
+    "xss": "^1.0.8"
   },
   "devDependencies": {
     "eslint": "^7.5.0",