Merge branch 'master' into 'develop-send-attrs'

# Conflicts:
#   R/Apply.R
1 job for develop-send-attrs
in 0 seconds, using 0 compute credits, and was queued for 0 seconds