Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.
Thank-you Martin Green for the patch.