Merge after merging unit_tests, cleanup and python_2to3 branches to master.
No changes between packaging and version 3