Merge branch '2019-06-20-master-imports'

- Assorted minor fixes