Make String::wrap() unicode aware. Solves #3981.
Merge pull request #1695 from renan/2.4-wordwrap

Make String::wrap() unicode aware. Fixes #3981.