Future merge master
Merge current master into future.
NOTE: DAQ/MDF has diverged significantly between the future and master -- instead of trying to resolve the resulting conflicts, I kept the code 'as is' in the future branch.
Merge current master into future.
NOTE: DAQ/MDF has diverged significantly between the future and master -- instead of trying to resolve the resulting conflicts, I kept the code 'as is' in the future branch.