Merge remote-tracking branch 'remote/master'

# Conflicts:
#	data.min.json

Author: KevinRoebert

data.min.json

@@ -3024,7 +3024,7 @@
             "forceRedirection": false
         },
         "shopee": {
-            "urlPattern": "^https?:\\/\\/(?:[a-z0-9-]+\\.)*?shopee\\.(com|co\\.th)",
+            "urlPattern": "^https?:\\/\\/(?:[a-z0-9-]+\\.)*?shopee\\.(com|co\\.th|tw)",
             "completeProvider": false,
             "rules": [
                 "publish_id",