Perforce

Integrate Sophos changes from perforce to my branch.