Make sure we return to UTF8 encoding
Merge branch 'email-pr-receiver' into dev