./setup.py installs flat package now
Merge remotes/origin/HEAD into py3