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

Conflicts:
	make.sh

diff --cc make.sh
index 59b8d511df2c8cd346f7ab973e467d3da8177ba2,f52f9e8b3b59829090db6360fb886ca35ed897c5..55684d5742aaa0011feaed6e3e160378f9ddecb1
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
- CORE="63"                                                     # Core Level (Filename)
+ CORE="64"                                                     # Core Level (Filename)
  PAKFIRE_CORE="63"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan