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

Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch

1 files changed, 30 insertions, 16 deletions

diff --git a/users/nstickney/nstickney.h b/users/nstickney/nstickney.h
index d3f5a7c6fc..2b596b25e5 100644
--- a/users/nstickney/nstickney.h
+++ b/users/nstickney/nstickney.h
@@ -1,20 +1,22 @@
-#include QMK_KEYBOARD_H
-
+/* Copyright 2021 @nstickney
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
-#define USE_SERIAL
-#define MASTER_LEFT
-
-#undef UNICODE_SELECTED_MODES
-#define UNICODE_SELECTED_MODES UC_OSX, UC_LNX, UC_WINC
-
-// Layers
-#define BASE 0 // Base layer
-#define SYMB 1 // Symbols
-#define SYSH 2 // Symbols, shifted
-#define NUMP 3 // Numpad
-#define FCTN 4 // Function
+#include QMK_KEYBOARD_H
 
-// Make keymaps more clear
+// Specialty keycodes
 #define CC_ESC LCTL_T(KC_ESC)
 #define CC_QUOT RCTL_T(KC_QUOT)
 #define AC_SLSH LALT_T(KC_SLSH)
@@ -22,4 +24,16 @@
 #define FC_BSLS LT(FCTN, KC_BSLS)
 #define FC_MINS LT(FCTN, KC_MINS)
 
-enum tap_dances {LOCKS = 0, LAYERS = 1};
\ No newline at end of file
+// Layers
+enum {
+    BASE,  // Base layer
+    SYMB,  // Symbols
+    NUMP,  // Numpad
+    FCTN   // Function
+};
+
+// Tap dance
+enum {
+    LOCKS,  // Activate NUM/CAPS/SCROLL lock
+    LAYERS  // Activate NUMP and SYMB layers
+};