Unicode consistency.
Automated merge for py3k testing