Merge branch 'master' of github.com:ledyba/cocos2d-x
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height