Update from cocos2d-x