Merge branch 'master' into 'dev-visualization-seasonal'

# Conflicts:
#   modules/Skill/Skill.R
2 jobs for dev-visualization-seasonal
in 3 minutes and 39 seconds, using 0 compute credits, and was queued for 2 seconds