Replace str() with unicode()
Merge branch 'hotfix/unicodeissue'