Merge branch '2.7'

5 jobs for master in 1 minute and 20 seconds (queued for 1 second)