Ensure our strings don't contain unicode (message body!)
Merge branch 'develop'