Converted recent changes to UTF-8 encoding