Ensure all users visit the canonical host
Merge branch 'canonical_host'