Subject: typos

From: Justin Pryzby <[email-masked]>
Date: Fri, 24 Sep 2021 16:58:27 -0500

A compilation of fixes for master.

The first patch should be applied to v13 - the typo was already fixed in master
but not backpatched.