Python 2 compatibility
Merge branch '3to2' into Setup