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

keyboards/keebio/quefrency/rev1/keyboard.json

@@ -63,8 +63,11 @@
     "build": {
         "lto": true
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},