Merge after merging cleanup and python_2to3 branches to master.
No changes between unit_tests and version 2