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

keyboards/hineybush/h87_g2/info.json

@@ -21,7 +21,7 @@
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x0001",
-        "vid": "0x4048"
+        "vid": "0x4069"
     },
     "layouts": {
         "LAYOUT": {