Bug 6752: Be stricter with utf-8 encoding of output