Merge branch 'master' into 'devel'

# Conflicts:
#   modules/host_filter.nf
2 jobs for devel