Merge branch '2019-07-29-master-imports'
authorTom Rini <trini@konsulko.com>
Mon, 29 Jul 2019 15:51:17 +0000 (11:51 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 29 Jul 2019 15:51:17 +0000 (11:51 -0400)
- Assorted bug fixes


Trivial merge