Merge branch 'master' into 'dev-Loading-load_daily_folders'

# Conflicts:
#   conf/archive.yml
2 jobs for dev-Loading-load_daily_folders
in 13 minutes and 6 seconds, using 0 compute credits, and was queued for 4 seconds