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

User