Merge branch 'tb/blame-resurrect-convert-to-git'