Merge branch 'ef/msys-imap'