Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
User module asset build
Merge pull request #549 from sexnothing/user

User module asset build