Merge remote-tracking branch 'refs/remotes/origin/master' into 2.6.0

# Conflicts:
#	bash/decoders/dump978.sh

bash/decoders/dump978.sh

@@ -227,7 +227,7 @@ tee $RECIEVER_BUILD_DIRECTORY/dump978/dump978-maint.sh > /dev/null <<EOF
 
 # Start dump978 without logging.
 while true; do
-    rtl_sdr -d $DUMP978DEVICE -f 978000000 -s 2083334 -g 48 - | $RECIEVER_BUILD_DIRECTORY/dump978/dump978 | $RECIEVER_BUILD_DIRECTORY/dump978/uat2json $LIGHTTPD_DOCUMENT_ROOT_DIRECTORY/dump978/data | $RECIEVER_BUILD_DIRECTORY/dump978/uat2esnt | /bin/nc -q1 127.0.0.1 30001 &
+    rtl_sdr -d $DUMP978DEVICE -f 978000000 -s 2083334 -g 48 - | $DUMP978BUILDDIRECTORY/dump978 | $DUMP978BUILDDIRECTORY/uat2json $LIGHTTPDDOCUMENTROOTDIRECTORY/dump978/data | $DUMP978BUILDDIRECTORY/uat2esnt | /bin/nc -q1 127.0.0.1 30001
     sleep 15
 done
 EOF

bash/variables.sh

@@ -1,4 +1,4 @@
-5#!/bin/bash
+#!/bin/bash
 
 #####################################################################################
 #                                  ADS-B RECEIVER                                   #