Merge branch 'jk/fast-import-die-nicely-fix' into maint