Merge branch '2020-06-15-misc-bugfixes'
authorTom Rini <trini@konsulko.com>
Mon, 15 Jun 2020 15:24:42 +0000 (11:24 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 15 Jun 2020 15:24:42 +0000 (11:24 -0400)
- Assorted bug fixes


Trivial merge