Merge remote-tracking branch 'ms/stunnel-addon'

diff --combined make.sh
index c702a7ff1f4aa2366e4f4845f08dc2ac35160b31,259675ac9e6df872edbab6f69c131c59dc40c36c..07d1371e94efd1c0d876d20b3e324e9610d1ae5e
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -798,6 -798,7 +798,7 @@@ buildipfire() 
    ipfiremake wavemon
    ipfiremake iptraf-ng
    ipfiremake iotop
+   ipfiremake stunnel
  }
  
  buildinstaller() {
@@@ -841,8 -842,7 +842,8 @@@ buildpackages() 
    ipfiremake cdrom
  
    # Check if there is a loop device for building in virtual environments
 -  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 +  modprobe loop 2>/dev/null
 +  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
    fi