Use clamdscan instead of clamscan. Fixes errors on upload
Merge remote branch 'upstream/master'