Merge branch '2021-09-14-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Tue, 14 Sep 2021 19:47:07 +0000 (15:47 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 14 Sep 2021 19:47:07 +0000 (15:47 -0400)
- Assorted bugfixes


Trivial merge