fixed #349
Merge branch 'v3' of github.com:htlxyz/cocos2d-x into v3