Updating vendors
Fixing vendors
Merge pull request #295 from dbellettini/2.7

Fixing vendors