Merge branch 'patch-3' of https://github.com/bes-internal/exim into master_dmarc_doc