Merge commit 'origin/master' into next

Conflicts:
	make.sh

diff --cc make.sh
index 577a123e9b144ca231d6befdbbcfe65d299a0e2d,03cf937360d1cd0ba628a6601736321d0c497f92..15923362ad14d1fb3a62139b68f4b7cffaedbe27
--- 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="41"                                                     # Core Level (Filename)
- PAKFIRE_CORE="40"                                             # Core Level (PAKFIRE)
+ CORE="42"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="41"                                             # 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