Merge branch 'master' into ppp-update

diff --combined make.sh
index 1f304e8c83350b2e935a6f9ba939ae9858bcb36e,eb63bb4ff9ed24673627bcf15ea31ace6f58fe37..03806c824b24e50d57277911e7e64d79b5870ae5
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.7"                                                 # Version number
- CORE="38"                                                     # Core Level (Filename)
+ CORE="39"                                                     # Core Level (Filename)
  PAKFIRE_CORE="38"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -337,6 -337,7 +337,6 @@@ buildipfire() 
    ipfiremake libusb
    ipfiremake libpcap
    ipfiremake ppp
 -  ipfiremake rp-pppoe
    ipfiremake pptp
    ipfiremake unzip
    ipfiremake which