Merge branch '2021-05-17-assorted-fixes'
authorTom Rini <trini@konsulko.com>
Tue, 18 May 2021 18:17:54 +0000 (14:17 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 May 2021 18:17:54 +0000 (14:17 -0400)

Trivial merge