ChangeLog: - Stop unintended re-encoding of author names from UTF-8 to ASCII - Fix compilation, the last rebase/merge went wrong. Approved by: eadler,bdrewery (mentors, implicit)