Fix borg for Py3k.
Automatic Py3k merge for testing