Modernize borg.
Automated merge for py3k testing