Merge tag '1.0.26' into develop

积分模块