Merge commit '360a8fd'; CLI: filter control characters in plain text message