Translate
Translate
Merge branch 'v3' of github.com:gonjay/cocos2d-x into v3