Merge branch 'master' into 'dev-skill-compute_probabilities'

# Conflicts:
#   modules/test_seasonal.R
2 jobs for dev-skill-compute_probabilities
in 4 minutes and 58 seconds, using 0 compute credits, and was queued for 4 seconds