Merge branch 'master' into hotfix/2.1a35
Minor cookie code cleanup and verification.
Merge branch 'hotfix/2.1a35' into release/2.1b1
Merge branch 'release/2.1b1' of github.com:vanillaforums/Garden into release/2.1b1