Updating vendor paths
Merge branch 'dev'