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

keyboards/checkerboards/quark_plus/quark_plus.c

@@ -17,7 +17,7 @@
 #include "quark_plus.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_kb(index, clockwise)) { return false; }
+    if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 1) { /* left encoder*/
                 if (clockwise){
                     tap_code(KC_WH_U);