Merge from cocos2d-x