Merge with cocos2dx:v3