Initial migration to python 3 support
Merge branch 'master' into 2.0