Merge pull request #1 from cocos2d/develop

merge from the cocos2d-x