Merge branch 'jc/maint-blame-no-such-path'