Merge branch '2019-06-20-master-imports'
authorTom Rini <[email protected]>
Fri, 21 Jun 2019 01:52:31 +0000 (21:52 -0400)
committerTom Rini <[email protected]>
Fri, 21 Jun 2019 01:52:31 +0000 (21:52 -0400)
- Assorted minor fixes


Trivial merge