Merge "Revert "Fix link prefix/suffixes around Category and Language links.""