Added vendor override to locations
Merge branch 'gh-pages' into phase-2