merge 2to3 improvments
18 files changed