Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h

diff --cc quantum/template/template.c
index 016e1130070dbc5a29f9221744e45e47b1802d7c,7dcd67cfcfb6e4f31546d364d7a678a799642fb0..828afb18c1f1ee9097dfd13126fe69981b724ca8
--- 1/quantum/template/template.c
--- 2/quantum/template/template.c
+++ b/quantum/template/template.c
@@@ -1,48 -1,23 +1,39 @@@
  #include "%KEYBOARD%.h"
  
  __attribute__ ((weak))
- void * matrix_init_user(void) {
+ void matrix_init_user(void) {
 -      // leave these blank
 -}
 +      // leave this function blank - it can be defined in a keymap file
 +      return NULL;
 +};
  
  __attribute__ ((weak))
- void * matrix_scan_user(void) {
+ void matrix_scan_user(void) {
 -      // leave these blank
 -}
 +      // leave this function blank - it can be defined in a keymap file
 +      return NULL;
 +};
 +
 +__attribute__ ((weak))
- void * led_set_user(uint8_t usb_led) {
++void led_set_user(uint8_t usb_led) {
 +      // leave this function blank - it can be defined in a keymap file
 +      return NULL;
 +};
  
- void * matrix_init_kb(void) {
+ void matrix_init_kb(void) {
        // put your keyboard start-up code here
        // runs once when the firmware starts up
-       if (matrix_init_user) {
-               (*matrix_init_user)();
-       }
-       return NULL;
 +      
 -}
+       matrix_init_user();
 +};
  
- void * matrix_scan_kb(void) {
+ void matrix_scan_kb(void) {
 -      // put your looping keyboard code here
 -      // runs every cycle (a lot)
 +    // put your looping keyboard code here
 +    // runs every cycle (a lot)
 +
-       if (matrix_scan_user) {
-               (*matrix_scan_user)();
-       }
-       return NULL;
+       matrix_scan_user();
 -}
 +};
 +
- void * led_set_kb(uint8_t usb_led) {
++void led_set_kb(uint8_t usb_led) {
 +      // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 +
-       if (led_set_user) {
-               (*led_set_user)(usb_led);
-       }
-       return NULL;
++      led_set_user(usb_led);
 +};

diff --cc quantum/template/template.h
index ed17ca00167388d3750660f75b5a912337222026,1171dc8e0f50c418060dc4c0fa10d66419929141..ba91abac3e64914f92e7a4fce0a5dd14ceb4a5ba
--- 1/quantum/template/template.h
--- 2/quantum/template/template.h
+++ b/quantum/template/template.h
@@@ -19,8 -19,7 +19,8 @@@
      { k10, KC_NO, k11 }, \
  } 
  
- void * matrix_init_user(void);
- void * matrix_scan_user(void);
- void * led_set_user(uint8_t usb_led);
+ void matrix_init_user(void);
+ void matrix_scan_user(void);
++void led_set_user(uint8_t usb_led);
  
  #endif