Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Fix uclient
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #665 from liuchuangww/user

User