Merge branch 'rm/gpg-program-doc-fix' into maint