Merge pull request #686 from Arantor/release-2.1

! Oops forgot to add a global.
Merge pull request #687 from Arantor/release-2.1

! Mantis bug 4473 - don't include the SID in canonical URLs.