Sync Cocos2d-x v3.1