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

keyboards/handwired/swiftrax/bumblebee/bumblebee.h

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define KC_NO XXX
+#define XXX KC_NO
 
 #include "quantum.h"