Always return unicode, even on UnicodeError.
Merge remote-tracking branch 'refs/remotes/ivan/bug/always-return-unicode' into develop