Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type.
Merge branch 't20812'