Py3k support (depends on changes to other repos)