Another workaround for minor bug with line breaks in the output.
Merge commit 'be005bef71bdbe8083a2c9661c301f271d443727' into python3