Merge branch 'jc/am-read-author-file' into maint