Merge branch 'master' into 'mpitests'

Master

See merge request !174
4 jobs for mpitests in 17 minutes and 2 seconds (queued for 1 second)