Merge branch 'master' into devel

6 jobs for devel in 1 minute and 51 seconds (queued for 3 seconds)