Merge branch 'stable' into main, ignoring its changes.

This preserves the stable branch as-is, so that it can
be accessed later if needed, and so the tag is preserved,
but does not change the code in the main branch.

Author: rwest