Merge pull request #547 from techee/locale_utf8