Merge branch 'master' into master

diff --cc keyboards/lets_split/ssd1306.c
index 4bf3a87437d354e748e2ccfaf6e7088071d1c55b,76348ab7f2cbf16ca278e8497c8b474d5ddbb085..5c6dff27f81461c6c256ef82429360f0e8d05a91
--- 1/keyboards/lets_split/ssd1306.c
--- 2/keyboards/lets_split/ssd1306.c
+++ b/keyboards/lets_split/ssd1306.c
@@@ -1,9 -1,7 +1,9 @@@
 +#ifdef SSD1306OLED
++
+ #include "ssd1306.h"
  #include "config.h"
  #include "i2c.h"
- #include <stdbool.h>
  #include <string.h>
- #include <stdio.h>
  #include "print.h"
  #include "lets_split.h"
  #include "common/glcdfont.c"