Merge remote-tracking branch 'stevee/squid-fast-shutdown' into next