Merge SquidDev's stuff