Merge branch 'uk/fix-author-ident-sed-script' into maint