Merge branch 'stable' into devel

6 jobs for devel in 32 minutes and 12 seconds (queued for 9 seconds)