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

keyboards/trashman/ketch/keyboard.json

@@ -139,7 +139,7 @@
 
         {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
         {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
-        {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
         {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
         {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
         {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},