fix
Merge branch 'master' of https://github.com/pigpigyyy/cocos2d-x