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

keyboards/zeix/singa/kohaku/keyboard.json

@@ -8,7 +8,8 @@
         "rgblight": true,
         "bootmagic": true,
         "extrakey": true,
-        "mousekey": true
+        "mousekey": true,
+        "nkro": true
     },
     "indicators": {
         "caps_lock": "GP29"