Merge branch '2020-12-02-master-imports'
authorTom Rini <trini@konsulko.com>
Thu, 3 Dec 2020 14:43:47 +0000 (09:43 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 3 Dec 2020 14:43:47 +0000 (09:43 -0500)
- Assorted minor fixes


Trivial merge