Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.
Thanks mark@ and Aramgutang for work on the patch.