Merge remote-tracking branch 'origin/next'

Conflicts:
	make.sh

diff --cc make.sh
index 2b24e1159e82b7a1d5344a7de2f125c3b9d7c5b5,40075916ebfb1c45b81578e24a7ab26e35d1f8a8..3f5b24837957448efb5c6a3ca12fd7d1a5b5c0e0
--- 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.15"                                                        # Version number
- CORE="85"                                                     # Core Level (Filename)
+ VERSION="2.17"                                                        # Version number
 -CORE="86"                                                     # Core Level (Filename)
++CORE="86test1"                                                        # Core Level (Filename)
  PAKFIRE_CORE="85"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan