Merge branch 'stable'

27 jobs for master in 45 minutes and 51 seconds (queued for 10 seconds)