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

keyboards/handwired/dactyl_manuform/6x6/info.json

@@ -100,7 +100,7 @@
                 {"x": 10, "y": 8}
             ]
         },
-        
+
         "LAYOUT_6x6_5_thumb": {
             "layout": [
                 {"x": 0, "y": 0},
@@ -180,8 +180,7 @@
                 {"x": 14, "y": 5},
 
                 {"x": 4, "y": 6},
-
-                {"x": 11, "y": 6},
+                {"x": 12, "y": 6},
 
                 {"x": 6, "y": 7},
                 {"x": 7, "y": 7},