upgraded six to match latest version
Merge branch '1.2.X'