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

keyboards/keebio/iris_ce/rev1/keyboard.json

@@ -118,11 +118,11 @@
             {"matrix": [8, 5], "x": 144, "y": 43, "flags": 4},
             {"matrix": [8, 4], "x": 160, "y": 42, "flags": 4},
             {"matrix": [8, 3], "x": 176, "y": 40, "flags": 4},
-            {"x": 184, "y": 50, "flags": 2},
             {"matrix": [8, 2], "x": 192, "y": 42, "flags": 4},
             {"matrix": [8, 1], "x": 208, "y": 45, "flags": 4},
-            {"x": 216, "y": 43, "flags": 2},
             {"matrix": [8, 0], "x": 224, "y": 45, "flags": 4},
+            {"x": 216, "y": 43, "flags": 2},
+            {"x": 184, "y": 50, "flags": 2},
             {"matrix": [9, 2], "x": 168, "y": 47, "flags": 4},
             {"matrix": [9, 3], "x": 152, "y": 58, "flags": 4},
             {"x": 144, "y": 58, "flags": 2},
@@ -215,4 +215,4 @@
             ]
         }
     }
-}
+}