Merge branch 'master' into 'develop-30-solvent-sector'

# Conflicts:
#   conf/hermes.conf
3 jobs for develop-30-solvent-sector
in 3 minutes and 49 seconds, using 0 compute credits, and was queued for 2 minutes and 6 seconds