Don't canonicalize '@' to '-' in language tags

Fixes #1406.
2 files changed