Merge branch 'master' into 'mpitests'

Master

See merge request !171
4 jobs for mpitests in 9 minutes and 15 seconds (queued for 1 second)