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

diff --cc make.sh
index 299ee6d36c6c69df693bbf782844d60dfce6878d,dec06f8f7a68cbed88d34642b1829d97430a0e78..b0f8b31b26cdd2565901c86f273f3189057fdacb
--- 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="63"                                                     # Core Level (Filename)
- PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="63"                                             # 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