Merge branch '2020-05-08-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Fri, 8 May 2020 22:58:19 +0000 (18:58 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 8 May 2020 22:58:19 +0000 (18:58 -0400)

Trivial merge