Merge remote-tracking branch 'origin/next' into thirteen

diff --cc make.sh
index 278c807f9a8e445efc6a1892c6d4bb41d76a292b,ea908d9480e5e58e499d018ef42ec346288d02e8..b60723d6ff2be2e4ed9f4d45d2380f24223ec011
--- 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.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
  CORE="64"                                                     # Core Level (Filename)
- PAKFIRE_CORE="63"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="64"                                             # 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