Merge pull request #6904 from lucize/clamav-milter