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

- Assorted bugfixes