Move python3.4 branch to main repo, and upstream merge