backup only
Merge branch 'slave'
Merge branch 'master' of github.com:zhutong/misc