Merge branch 'vendor'

3 jobs for master in 20 seconds (queued for 7 seconds)