Merge branch '2019-12-13-master-imports'
authorTom Rini <trini@konsulko.com>
Sat, 14 Dec 2019 01:58:49 +0000 (20:58 -0500)
committerTom Rini <trini@konsulko.com>
Sat, 14 Dec 2019 01:58:49 +0000 (20:58 -0500)
- Assorted minor fixes


Trivial merge