Merge branch '2021-07-28-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Thu, 29 Jul 2021 16:10:23 +0000 (12:10 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 29 Jul 2021 16:10:55 +0000 (12:10 -0400)
- Assorted bugfixes


Trivial merge