621b30d7

By: Michael Lynch <git@mtlynch.io>

Merge master into no-json-types

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>