am f12b1d35: Merge "Move conversion from ISO-8859-1 to UTF8 after applying patches"

* commit 'f12b1d35b7258ff3ceaf3740b72eba7bb72d86dd':
  Move conversion from ISO-8859-1 to UTF8 after applying patches