Merge upstream/main to resolve conflicts before review

Pulls in 8 days of upstream changes since 2026-05-19. Our one-line addition at the markitup-mcp-server entry preserved. # Conflicts: # README.md

Michael committed May 27, 2026 at 19:28 UTC fa1f35a3164937185c17622a80e1a0e027a904e7

No changes.