Sync with cocos2d main