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

Conflicts:
	make.sh

diff --cc lfs/dhcp
Simple merge

diff --cc make.sh
index e02365f45bbbdc1767f6c831b9779eecf4028da3,773da6629287c837c76f654e3c7ba0bd9753c661..c139bf52751ae37aff328351ed41758c5c867c8d
--- 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="62"                                                     # Core Level (Filename)
+ CORE="63"                                                     # Core Level (Filename)
  PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan