Merge branch 'master' into 'Auto-CALIOPE'

Master

See merge request !34
3 jobs for Auto-CALIOPE
in 2 minutes and 22 seconds, using 0 compute credits, and was queued for 5 seconds