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

keyboards/momokai/tap_duo/info.json

@@ -2,7 +2,7 @@
     "keyboard_name": "Tap Duo",
     "manufacturer": "Momokai",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "peepeetee",
     "usb": {
         "vid": "0x69F9",
         "pid": "0x0005",
@@ -21,6 +21,9 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [