Merge from upstream
authorJacob Bachmeyer <jcb@gnu.org>
Fri, 13 Jan 2023 04:38:22 +0000 (22:38 -0600)
committerJacob Bachmeyer <jcb@gnu.org>
Fri, 13 Jan 2023 04:38:22 +0000 (22:38 -0600)

Trivial merge