Merge branch 'squid'