Merge from cocos2d/develop #4