Merge branch 'beyond-next' into next

diff --combined make.sh
index 93949dce5579b43d4b7e221f68860e6a6b713f3a,554254ba53eda5e17dc13f5431698ea7513f5d29..39a54f4b8993d494598b89fa131d08fd6c7be882
--- 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.15"                                                        # Version number
 -CORE="76-beta3"                                                       # Core Level (Filename)
 +CORE="76-rc1"                                                 # Core Level (Filename)
  PAKFIRE_CORE="76"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -692,7 -692,6 +692,6 @@@ buildipfire() 
    ipfiremake git
    ipfiremake squidclamav
    ipfiremake vnstat
-   ipfiremake vnstati
    ipfiremake iw
    ipfiremake wpa_supplicant
    ipfiremake hostapd