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

keyboards/mechlovin/kay60/info.json

@@ -74,7 +74,7 @@
                 {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_ansi": {
+        "LAYOUT_60_ansi": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},