Small fix for Text wordWrapping #1247
Merge remote-tracking branch 'origin/master' into dev
Merge remote-tracking branch 'origin/dev' into dev