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

keyboards/aidansmithdotdev/sango/keyboard.json

@@ -117,7 +117,7 @@
     },
     "split": {
         "bootmagic": {
-            "matrix": [4, 7]
+            "matrix": [5, 7]
         },
         "enabled": true,
         "matrix_pins": {

keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json

@@ -81,7 +81,7 @@
             "pin": "D3"
         },
         "bootmagic": {
-            "matrix": [4, 5]
+            "matrix": [5, 5]
         }
     },
     "ws2812": {

keyboards/keebio/foldkb/rev2/keyboard.json

@@ -153,7 +153,7 @@
     },
     "split": {
         "bootmagic": {
-            "matrix": [5, 8]
+            "matrix": [5, 7]
         },
         "enabled": true,
         "handedness": {