Merge pull request #1 from cocos2d/v3

merge from head version