Merge remote-tracking branch 'remotes/origin/master' into Auto-CALIOPE

# Conflicts:
#	conf/EI_configuration.csv
3 jobs for Auto-CALIOPE
in 1 minute and 36 seconds, using 0 compute credits, and was queued for 1 second