Merge remote-tracking branch 'stevee/core67-merge' into next

Conflicts:
	make.sh

diff --cc make.sh
index fbd377e564830f1c943ea4d0faaaac4f7dbe3be8,b92d47a5d24ce93b9b3a55677ccc77ad7eb92850..e427929dc7a54a64ed96c015c984f6473999b308
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -754,10 -755,7 +755,11 @@@ buildipfire() 
    ipfiremake libstatgrab
    ipfiremake sarg
    ipfiremake fstrim
 +  ipfiremake check_mk_agent
 +  ipfiremake libdaemon
 +  ipfiremake avahi
 +  ipfiremake nginx
+   ipfiremake sendEmail
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild