MODULES-780 Don't blow up on unicode characters.
Merge pull request #327 from adik/master

MODULES-780 Don't blow up on unicode characters.