Merge branch 'next' into fifteen

diff --combined config/rootfiles/oldcore/73/update.sh
index 6730e0d76185235255fdd7212723ba2c6c214523,ee799adb62f1cc9fea667943d6e57d11220b50c1..ee799adb62f1cc9fea667943d6e57d11220b50c1
--- 1/config/rootfiles/oldcore/73/update.sh
--- 2/config/rootfiles/core/73/update.sh
+++ b/config/rootfiles/oldcore/73/update.sh
@@@ -47,7 -47,7 +47,7 @@@ if [ -e "/var/ipfire/proxy/enable" ] |
                eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
  
                TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))"
-               echo "TRANSPORT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings
+               echo "TRANSPARENT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings
        )
  fi