Merge branch '2019-08-20-master-imports'
authorTom Rini <trini@konsulko.com>
Wed, 21 Aug 2019 01:40:12 +0000 (21:40 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 21 Aug 2019 01:40:12 +0000 (21:40 -0400)
- Assorted bugfixes


Trivial merge