Merge branch '2019-08-30-master-imports'

- Assorted bug fixes