Second fix for #1886 dealing with the output on non-UTF8-default systems
Merge branch 'v3.0'