Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
User module bug fixed
Merge pull request #630 from sexnothing/user

User module bug fixed