Merge commit 'origin/master' into next

diff --cc make.sh
index 4bec05b9bf29432da98900b08047e451ebe41e26,b8035b68fb84c8f553bf6bb202979f5cd796f23a..36211fec68bb14a19402f2fd703c758e7f75f438
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.7"                                                 # Version number
 +VERSION="2.8test"                                             # Version number
  CORE="42"                                                     # Core Level (Filename)
- PAKFIRE_CORE="41"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir