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

# Conflicts:
#   modules/Loading/Loading.R
#   modules/Skill/Skill.R
2 jobs for dev-saving-seasonal
in 35 seconds, using 0 compute credits, and was queued for 2 seconds