Merge branch 'master' into develop-69-calculate-running-8-hour-mean

3 jobs for develop-28-downloads-config
in 55 minutes and 54 seconds, using 0 compute credits, and was queued for 3 seconds