Merge branch '2019-07-29-master-imports'

- Assorted bug fixes