Merge branch 'vendor'

4 jobs for master in 1 minute and 18 seconds (queued for 5 seconds)