Merge branch 'master' into devel

10 jobs for devel in 10 minutes and 38 seconds (queued for 36 seconds)