Merge pull request #3047 from prattmic:python2and3