Fixing vendor files.
Merge branch 'InfernoBranch', correcting vendor files.