Merge branch 'master' into devel

6 jobs for devel in 3 minutes and 54 seconds (queued for 11 seconds)