Made sure there will never be a \r or \n in a message.
Merge remote-tracking branch 'parent/master'