Merge pull request #2549 from castillofrancodamian/clamav