Merge remote-tracking branch 'upstream/edge' into feature/kill-button

Conflicts:
	ConfigSamples/Smoothieboard/config

diff --cc ConfigSamples/Smoothieboard/config
index f63608a,117f159..638d6fe
--- 1/ConfigSamples/Smoothieboard/config
--- 2/ConfigSamples/Smoothieboard/config
+++ b/ConfigSamples/Smoothieboard/config
@@@ -60,10 -60,8 +60,11 @@@ second_usb_serial_enabl
                                                                # and a terminal connected)
  #leds_disable                                true             # disable using leds after config loaded
  #play_led_disable                            true             # disable the play led
- #msd_disable                                 false            # disable the MSD (USB SDCARD) when set to true
 +pause_button_enable                          true             # Pause button enable
 +#kill_button_enable                           false            # enable the kill button
 +#kill_button_pin                              2.12             # kill button pin. default is same as pause button 2.12 (2.11 is another good choice)
+ #msd_disable                                 false            # disable the MSD (USB SDCARD) when set to true (needs special binary)
+ #dfu_enable                                  false            # for linux developers, set to true to enable DFU
  
  # Extruder module configuration
  extruder.hotend.enable                          true             # Whether to activate the extruder module at all. All configuration is ignored if false

diff --cc src/modules/communication/GcodeDispatch.cpp
Simple merge