Merge branch 'python3' into master (-s ours)