Fixes unmerged changes from trunk@307 to tags/release-1.6.4. This has happened due to improper handling of ISO-8859-1/UTF-8 by some software in the middle of the process. My fault.