Merge "Fix link prefix/suffixes around Category and Language links (take 2)."