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

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