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

- Assorted minor bugfixes