fixes vendors
Merge branch 'master' into traitfix