Merge branch 'master' into next

diff --combined config/rootfiles/oldcore/151/update.sh
index 16135b2efe185c0b1fb0d9d2baa8965fa483edc5,699528274a8fbaf8e047ed930e482936b37bae2f..699528274a8fbaf8e047ed930e482936b37bae2f
--- 1/config/rootfiles/oldcore/151/update.sh
--- 2/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@@ -50,6 -50,9 +50,9 @@@ ldconfi
  # Filesytem cleanup
  /usr/local/bin/filesystem-cleanup
  
+ # Apply local configuration to sshd_config
+ /usr/local/bin/sshctrl
+ 
  # Start services
  /etc/init.d/sshd restart
  if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then