Test vendor mod
Merge pull request #1 from rwestergren/upstream

Test vendor mod