Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint