Merge branch 'master' into wechat
.
Merge branch 'wechat' of https://github.com/pencilkill/g-yiii4 into wechat