Merge pull request #6970 from cotequeiroz/squid_4.2