Merge pull request #4113 from lucize/clamupdate