Merge branch 'master' into tests

4 jobs for tests in 61 minutes and 26 seconds (queued for 2 minutes and 43 seconds)
Name Stage Failure
failed
test_min Test There is an unknown failure, please try again
No job log
failed
test_mpi_fftw Test There is an unknown failure, please try again
No job log