Merge branch 'master' of https://github.com/huhuo/general.git
Merge branch 'master' of https://github.com/huhuo/general.git