Ensure we remove characters that might break formatting
Merge branch 'robust-logging'