am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

* commit 'ee4c84642afffa80f23039bbc2d4f59de11f67da':
  Handle surrogate pairs in Html.toHtml()