Merge branch 'master' into next

diff --combined config/rootfiles/oldcore/139/update.sh
index d0b979d6bcb27b655749ad8f14a2ecf62e156d53,df45990bb4c074b7d1ed40d8f8ee36cbe82e7c8c..df45990bb4c074b7d1ed40d8f8ee36cbe82e7c8c
--- 1/config/rootfiles/oldcore/139/update.sh
--- 2/config/rootfiles/core/139/update.sh
+++ b/config/rootfiles/oldcore/139/update.sh
@@@ -58,10 -58,14 +58,14 @@@ ldconfi
  # Update Language cache
  /usr/local/bin/update-lang-cache
  
+ # Apply local configuration to sshd_config
+ /usr/local/bin/sshctrl
+ 
  # Start services
+ /etc/init.d/sshd restart
  
  # This update needs a reboot...
- #touch /var/run/need_reboot
+ touch /var/run/need_reboot
  
  # Finish
  /etc/init.d/fireinfo start