Merge branch 'master' into 'develop-23-numpy-arrange-problem-when-creating-grid'

# Conflicts:
#   conf/hermes.conf
3 jobs for develop-23-numpy-arrange-problem-when-creating-grid
in 2 minutes and 25 seconds, using 0 compute credits, and was queued for 4 minutes and 14 seconds