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

keyboards/gmmk/numpad/info.json

@@ -39,7 +39,7 @@
                 {"label": "4", "matrix": [2, 0], "x": 0, "y": 2},
                 {"label": "5", "matrix": [2, 1], "x": 1, "y": 2},
                 {"label": "6", "matrix": [2, 2], "x": 2, "y": 2},
-                {"label": "CALC", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "CALC", "matrix": [2, 3], "x": 4.25, "y": 0},
 
                 {"label": "1", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "2", "matrix": [3, 1], "x": 1, "y": 3},
@@ -47,7 +47,7 @@
                 {"label": "RET", "matrix": [3, 3], "x": 3, "y": 3, "h": 2},
 
                 {"label": "0", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"label": ".", "matrix": [4, 3], "x": 3, "y": 4}
+                {"label": ".", "matrix": [4, 3], "x": 2, "y": 4}
             ]
         }
     }