Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11