Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller
fixed crash cause by incorrect font name.
Merge pull request #7428 from Dhilan007/v3-320final

fixed crash cause by incorrect font name.