Merge branch '2019-08-30-master-imports'
authorTom Rini <trini@konsulko.com>
Sat, 31 Aug 2019 21:38:02 +0000 (17:38 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 31 Aug 2019 21:38:02 +0000 (17:38 -0400)
- Assorted bug fixes


Trivial merge