Merge branch 'hb/hg-to-git-py3'