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

tmk_core/protocol/chibios/usb_main.c

@@ -91,7 +91,7 @@ union {
     report_digitizer_t digitizer;
 #endif
 #ifdef JOYSTICK_ENABLE
-    joystick_report_t joystick;
+    report_joystick_t joystick;
 #endif
 } universal_report_blank = {0};