sync with devel

6 jobs for stable in 179 minutes and 55 seconds (queued for 3 seconds)