Resolve canonicalisation failures.
Merge pull request #501 from rjc123/zendesk

Resolve canonicalisation failures.