Merge branch 'master' into 'development'
# Conflicts: # .gitignore # CHANGELOG.md # diva_evaluation_cli/__init__.py # diva_evaluation_cli/bin/commands/actev_validate_execution.py # diva_evaluation_cli/bin/private_src/entry_points/actev_validate_execution.py # requirements.txt