Merge branch 'master' into 'development'
# Conflicts: # .gitignore # CHANGELOG.md # diva_evaluation_cli/__init__.py # diva_evaluation_cli/bin/cli.py # diva_evaluation_cli/bin/install.sh # doc/cli.md
# Conflicts: # .gitignore # CHANGELOG.md # diva_evaluation_cli/__init__.py # diva_evaluation_cli/bin/cli.py # diva_evaluation_cli/bin/install.sh # doc/cli.md