develop rebase. six.iteritems usage. Other python3 stuff. Tests OK
32 files changed