Don't blow up when uploading unicode
Merge pull request #2430 from dimagi/unicode-upload

Don't blow up when uploading unicode