Merge remote-tracking branch 'origin/master' into develop

keyboards/40percentclub/nein/info.json

@@ -5,7 +5,7 @@
   "maintainer": "qmk",
   "usb": {
     "vid": "0x4025",
-    "vid": "0x9999",
+    "pid": "0x9999",
     "device_version": "99.9.9"
   },
   "layouts": {

keyboards/40percentclub/nori/info.json

@@ -5,7 +5,7 @@
     "maintainer": "qmk",
     "usb": {
       "vid": "0x4025",
-      "pid": "0xA0C",
+      "pid": "0x0A0C",
       "device_version": "4.4.4"
     },
     "layouts": {

keyboards/40percentclub/ut47/info.json

@@ -5,7 +5,7 @@
   "maintainer": "qmk",
   "usb": {
     "vid": "0x4025",
-    "vid": "0x7574",
+    "pid": "0x7574",
     "device_version": "0.0.1"
   },
   "layouts": {