Merge branch 'master' into 81-mpi

17 jobs for 81-mpi in 13 minutes and 48 seconds (queued for 8 seconds)