Merge branch 'jc/maint-imap-config-parse' into maint