Merge remote-tracking branch 'remotes/origin/devel' into fixci

# Conflicts:
#	Snakefile
#	requirements.txt
#	tests/test_integration_run.yml