am 2ffa4aab: Merge "Use char16_t for char things."

* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.