Redo merge of Backlog/support py3k

Merge request was set to squash and ended up with a useless message. Redo the merge to maintain full history as per previous merges.