Activate "squidguard+squid3" pbi to hopefully alleviate some of the (re)install weirdness on 2.1 when trying to use both squid 3.x and squidguard.
Merge remote-tracking branch 'upstream/master'
Remove some extraneous pass-by-reference tags to stop "copy on write"
Fix it so we return to selected category after page edits.