Pull down updates from cocos2d:develop #7