Do Unicode conversion from bytestring more properly.
Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py