updates from stable

6 jobs for devel in 123 minutes and 20 seconds (queued for 2 seconds)