Merge remote-tracking branch 'stevee/proxy-squidclamav' into next