Merge pull request #1090 from stweil/utf8