Merge branch 'master' of https://github.com/MailCore/mailcore2
Merge branch 'master' of https://github.com/mros365/mailcore2