Merge "Remove "only newlines in trailer" special case for category/language links"