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

keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk

@@ -1,2 +1,3 @@
 WPM_ENABLE = yes
-VIA_ENABLE = yes
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no