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

layouts/community/ortho_5x12/xyverz/rules.mk

@@ -12,13 +12,14 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 
-ifneq ("$(KEYBOARD)","nyquist")
-  RGBLIGHT_ENABLE = yes
-  BACKLIGHT_ENABLE = yes
-else
+
+#ifneq ("$(KEYBOARD)","nyquist")
+#  RGBLIGHT_ENABLE = yes
+#  BACKLIGHT_ENABLE = yes
+#else
   RGBLIGHT_ENABLE = no
   BACKLIGHT_ENABLE = no
-endif
+#endif
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend