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

3 files changed, 10 insertions, 2 deletions

diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md
index dc98e2af0..733c65a97 100644
--- a/users/mechmerlin/changelog.md
+++ b/users/mechmerlin/changelog.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to my userspace will be documented in this file.
 
+## [0.4.1] - 2021-10-30
+
+### Added
+- `RGB_DISABLE_WHEN_USB_SUSPENDED` added in `config.h`. Couple of my boards now have per key RGB and have been staying on when my computer sleeps. 
 ## [0.4.0] - 2021-10-05
 
 ### Added
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index 698e237b0..459c18167 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -5,6 +5,10 @@
     #define RGBLIGHT_ANIMATIONS
 #endif // RGBLIGHT_ENABLE
 
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+#endif
+
 #ifdef AUDIO_CLICKY
     #define AUDIO_CLICKY_ON
     #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f
diff --git a/users/mechmerlin/readme.md b/users/mechmerlin/readme.md
index c0b1c54c5..107095311 100644
--- a/users/mechmerlin/readme.md
+++ b/users/mechmerlin/readme.md
@@ -39,9 +39,9 @@ Output the version of QMK Firmware on device.
 ## QMK Features
 ----
 
-### RGBLIGHT_SLEEP
+### RGBLIGHT_SLEEP and RGB_DISABLE_WHEN_USB_SUSPENDED
 
-Ensures that when my computer is in sleep mode, the keyboard underglow lights will also be off. 
+Ensures that when my computer is in sleep mode, the keyboard underglow and inswitch RGB lights will also be off. 
 
 ### Audio Clicky