Merged from cocos2d:master