Merge commit '71381457fa1311dfa0b58ba882a96db740640871'

Conflicts:
	tmk_core/doc/keymap.md

diff --cc tmk_core/common.mk
Simple merge

diff --cc tmk_core/common/action.c
Simple merge

diff --cc tmk_core/common/action_layer.c
Simple merge

diff --cc tmk_core/common/bootmagic.c
index 61236becb33f9b4038f7bfdad1241e363b134a4f,056806f23065dfec5be575e934c754e2be4312fb..eb06d7874da2fc1963e2a3bb7ea2c58e7f4ebcfe
--- 1/tmk_core/common/bootmagic.c
--- 2/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@@ -41,14 -41,17 +42,17 @@@ void bootmagic(void
          bootloader_jump();
      }
  
+     /* user-defined checks */
+     hook_bootmagic();
+ 
      /* debug enable */
      debug_config.raw = eeconfig_read_debug();
 -    if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_ENABLE)) {
 -        if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MATRIX)) {
 +    if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_ENABLE)) {
 +        if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_MATRIX)) {
              debug_config.matrix = !debug_config.matrix;
 -        } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_KEYBOARD)) {
 +        } else if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_KEYBOARD)) {
              debug_config.keyboard = !debug_config.keyboard;
 -        } else if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEBUG_MOUSE)) {
 +        } else if (bootmagic_scan_key(BOOTMAGIC_KEY_DEBUG_MOUSE)) {
              debug_config.mouse = !debug_config.mouse;
          } else {
              debug_config.enable = !debug_config.enable;

diff --cc tmk_core/common/chibios/bootloader.c
Simple merge

diff --cc tmk_core/common/chibios/sleep_led.c
Simple merge

diff --cc tmk_core/common/hook.c
index 0000000000000000000000000000000000000000,204407b738c02224e1ef276e0d25f9335e734ea0..204407b738c02224e1ef276e0d25f9335e734ea0
mode 000000,100644..100644
--- /dev/null
--- 2/common/hook.c
+++ b/tmk_core/common/hook.c

diff --cc tmk_core/common/hook.h
index 0000000000000000000000000000000000000000,ff569d49c9caa5db564f2d6a57397456ff0b2c9c..ff569d49c9caa5db564f2d6a57397456ff0b2c9c
mode 000000,100644..100644
--- /dev/null
--- 2/common/hook.h
+++ b/tmk_core/common/hook.h

diff --cc tmk_core/common/keyboard.c
Simple merge

diff --cc tmk_core/doc/keymap.md
Simple merge

diff --cc tmk_core/protocol/chibios/README.md
Simple merge

diff --cc tmk_core/protocol/chibios/main.c
Simple merge

diff --cc tmk_core/protocol/chibios/usb_main.c
Simple merge

diff --cc tmk_core/protocol/lufa/lufa.c
Simple merge

diff --cc tmk_core/tool/chibios/chibios.mk
Simple merge

diff --cc tmk_core/tool/chibios/common.mk
Simple merge

diff --cc tmk_core/tool/mbed/common.mk
Simple merge