Merge branch 'ma/hg-to-git'