Merge branch 'next'

diff --combined config/rootfiles/oldcore/91/update.sh
index 1104c9fa4eb7f6464b1a94acf81158b13516b03e,1e55e8bd5dbc22bff39f4c763ea6022e995796b9..1104c9fa4eb7f6464b1a94acf81158b13516b03e
--- 1/config/rootfiles/core/91/update.sh
--- 2/config/rootfiles/oldcore/91/update.sh
+++ b/config/rootfiles/oldcore/91/update.sh
@@@ -54,11 -54,6 +54,11 @@@ if [ `grep "ENABLED=on" /var/ipfire/vpn
        /etc/init.d/ipsec start
  fi
  
 +# Update grub config to display new core version
 +if [ -e /boot/grub/grub.cfg ]; then
 +      grub-mkconfig > /boot/grub/grub.cfg
 +fi
 +
  # This update need a reboot...
  touch /var/run/need_reboot