Merge pull request #2948 from ivantcholakov/develop

Making highlight_phrase() to be UTF-8 compatible on demand.