get rid of this vendor nonsense
Merge branch 'master' into new_master