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

keyboards/hhkb/jp/keyboard.json

@@ -48,7 +48,6 @@
         {"matrix": [14, 3], "x": 10.5, "y": 1},
         {"matrix": [15, 3], "x": 11.5, "y": 1},
         {"matrix": [13, 3], "x": 12.5, "y": 1},
-        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
         {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
         {"matrix": [2, 6], "x": 1.75, "y": 2},
@@ -63,6 +62,7 @@
         {"matrix": [15, 6], "x": 10.75, "y": 2},
         {"matrix": [13, 6], "x": 11.75, "y": 2},
         {"matrix": [12, 6], "x": 12.75, "y": 2},
+        {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
         {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
         {"matrix": [6, 5], "x": 2, "y": 3},