Rebased onto upstream history to resolve merge conflict (previous branch had unrelated history from punkpeye/awesome-mcp-servers).