Merge branch 'master' into 'dev-rearrange-fun-args'

# Conflicts:
#   modules/Calibration/Calibration.R
2 jobs for dev-rearrange-fun-args
in 2 minutes and 13 seconds, using 0 compute credits, and was queued for 1 second