Merge branch 'jk/mailsplit-maildir-muttsort' into maint