Merge branch '2.7'

5 jobs for master
in 1 minute and 34 seconds and was queued for 1 second