Retab clamscan/manager.c to make more readable
Merge remote-tracking branch 'upstream/master'