Merge branch 'master' into devel

6 jobs for devel in 4 minutes and 35 seconds (queued for 2 seconds)