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

keyboards/mechwild/clunker/info.json

@@ -12,7 +12,6 @@
         "mousekey": true,
         "nkro": true,
         "encoder": true,
-        "encoder_map": true,
         "haptic": true
     },
     "matrix_pins": {

keyboards/mechwild/clunker/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/mechwild/clunker/keymaps/via/rules.mk

@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes