Merge branch '2020-09-16-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Thu, 17 Sep 2020 13:53:57 +0000 (09:53 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 17 Sep 2020 13:53:57 +0000 (09:53 -0400)
- Assorted bug fixes


Trivial merge