Merge branch '2021-08-21-assorted-changes'
authorTom Rini <trini@konsulko.com>
Sun, 22 Aug 2021 19:44:53 +0000 (15:44 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 22 Aug 2021 19:44:53 +0000 (15:44 -0400)

Trivial merge