Merge branch 'master' into 'dev-Skill-RMSSS'

# Conflicts:
#   modules/test_seasonal.R
2 jobs for dev-Skill-RMSSS
in 29 seconds, using 0 compute credits, and was queued for 3 seconds