Why does this PR contain some changes in https://github.com/cocos2d/cocos2d-x/pull/2013 ?