Auto-Merge pull request #3058 from cjmayo/debug_utf8