Merge branch '2.x'

6 jobs for master in 2 minutes and 28 seconds (queued for 3 minutes and 6 seconds)