Merge branch '2021-04-27-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Tue, 27 Apr 2021 12:24:10 +0000 (08:24 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 27 Apr 2021 12:24:10 +0000 (08:24 -0400)
- An assortment of bug fixes


Trivial merge