Merge branch '5.x'

11 jobs for master in 5 minutes and 36 seconds (queued for 2 seconds)