Merge branch 'master' into devel

6 jobs for devel in 4 minutes and 39 seconds (queued for 1 second)