Fixed multi-byte support for HTML output
(cherry picked from commit 89b351e)
Merge branch 'master' into mb_support