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

quantum/quantum.h

@@ -39,10 +39,6 @@
 
 #if defined(RGBLIGHT_ENABLE)
 #    include "rgblight.h"
-#elif defined(RGB_MATRIX_ENABLE)
-// Dummy define RGBLIGHT_MODE_xxxx
-#    define RGBLIGHT_H_DUMMY_DEFINE
-#    include "rgblight.h"
 #endif
 
 #ifdef RGB_MATRIX_ENABLE