Merge pull request #1 from cocos2d/develop

Merge from cocos2d-x