Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Typo fix
Merge pull request #548 from liuchuangww/user

User