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

diff --cc tmk_core/common.mk
index 159183a267d5b2207826d640944ce83748922f00,3b53c0a046764e6b50c120c03c03c2451a3ab417..8e6ba561315e03c532b41e6cca8b040c1f137457
--- 1/tmk_core/common.mk
--- 2/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@@ -53,8 -53,12 +53,12 @@@ ifdef USB_6KRO_ENABL
      OPT_DEFS += -DUSB_6KRO_ENABLE
  endif
  
+ ifdef KEYBOARD_LOCK_ENABLE
+     OPT_DEFS += -DKEYBOARD_LOCK_ENABLE
+ endif
+ 
  ifdef SLEEP_LED_ENABLE
 -    SRC += $(COMMON_DIR)/sleep_led.c
 +    SRC += $(COMMON_DIR)/avr/sleep_led.c
      OPT_DEFS += -DSLEEP_LED_ENABLE
      OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
  endif