Merge branch '2.x'

6 jobs for master in 2 minutes and 29 seconds (queued for 26 seconds)