Merge from the latest version of cocos2d-x master