Merge branch 'jn/ident-from-etc-mailname'