Sync Cocos2d-x to v3.1