Merge branch 'vendor'

3 jobs for master in 8 minutes and 3 seconds