Merge branch 'master' into 'dev_i36'

# Conflicts:
#   diva_evaluation_cli/bin/commands/actev_exec.py
1 job for dev_i36 in 23 seconds (queued for 4 seconds)