Merge https://github.com/cocos2d/cocos2d-x/pull/2796