Merge branch '2021-05-26-assorted-bugfixes'
authorTom Rini <trini@konsulko.com>
Thu, 27 May 2021 11:41:25 +0000 (07:41 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 27 May 2021 11:41:25 +0000 (07:41 -0400)

Trivial merge