Merge branch 'master' into devel

8 jobs for devel in 8 minutes and 36 seconds (queued for 1 second)