Merge remote-tracking branch 'upstream/user' into user
Move custom config to custom dir
Merge pull request #522 from liuchuangww/user

User