临时到1.3分支上
回归1.2版本
Merge pull request #92 from WeweTom/1.3

Auto merge by kpm server