Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge branch 'master' of https://github.com/wgzhxy/weixin