Added a thing from master
Random shit from master
So a unicodestring and a bytestring walk into a bar...