Merge branch '2.5'

5 jobs for master
in 1 minute and 20 seconds and was queued for 2 seconds