Merge branch 'master' into don

diff --cc keyboards/ergodox/keymaps/default/keymap.c
index f7a82cfa1c0a27591087b145d1b785b437d9425e,4477cab3105c7bba7b686617aa69beca7fcf177b..82ef5766db4985254928077e8b1f5054751c97d3
--- 1/keyboards/ergodox/keymaps/default/keymap.c
--- 2/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@@ -6,9 -6,13 +6,14 @@@
  #define BASE 0 // default layer
  #define SYMB 1 // symbols
  #define MDIA 2 // media keys
 +#define PLVR 3 // Plover layer
  
- #define EPRM M(1) // Macro 1: Reset EEPROM
+ enum custom_keycodes {
+   PLACEHOLDER = SAFE_RANGE, // can always be here
+   EPRM,
+   VRSN,
+   RGB_SLD
+ };
  
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap 0: Basic layer