bug fix
Merge branch 'v3' of https://github.com/xinxu/cocos2d-x into v3