Keep vendor tidy
Merge branch 'master' into development
Use user instead of username