Merge pull request #1 from cocos2d/develop

Master