b5fe5d57

By: Michael Lynch <git@mtlynch.io>

Merge master into upload-to-s3

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