Merge branch 'master' into next

Conflicts:
	make.sh

diff --cc make.sh
index 6d1e423905537ee788afe62917f7515ac4d35376,f42082c8326f2db06be989f0e38ef97f8118a94f..8c08fc34cb8384708c1f06aea8f1303eab1b78c8
--- 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.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
- CORE="50"                                                     # Core Level (Filename)
- PAKFIRE_CORE="49"                                             # Core Level (PAKFIRE)
+ CORE="51"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="50"                                             # 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