Fix for the previous UTF8 encoding - now should only apply if the string isn't UTF8.
Merge branch 'hotfix/utf8_once'