Merge branch '2021-03-28-assorted-bugfixes'
authorTom Rini <trini@konsulko.com>
Mon, 29 Mar 2021 00:28:51 +0000 (20:28 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 29 Mar 2021 00:28:51 +0000 (20:28 -0400)

Trivial merge