Merge branch 'jk/commit-die-on-bogus-ident' into maint