Merge branch 'stable'

23 jobs for master in 9 minutes and 1 second (queued for 6 seconds)