Merge branch 'master' into 'parallel-grid-wip'

# Conflicts:
#   dune/elasticity/common/trustregionsolver.cc
3 jobs for parallel-grid-wip in 2 minutes and 42 seconds (queued for 1 second)