Merge branch 'master' into robey

reform2-keyboard-fw/controller.c

@@ -184,7 +184,7 @@ void controller_turn_off_keyboard(void) {
     do {
         wdt_reset();
         WDTCSR = (1<<WDCE) | (1<<WDE); // Enable writes to watchdog
-        WDTCSR = (1<<WDIE) | (1<<WDE) | (1<<WDP2) | (1<<WDP1) | (1<<WDP0); // Interrupt mode, 1s timeout
+        WDTCSR = (1<<WDIE) | (1<<WDE) | (1<<WDP2) | (1<<WDP1); // Interrupt mode, 1s timeout
 
         // Enter Power-save mode
         set_sleep_mode(SLEEP_MODE_PWR_DOWN);