Merge branch '2019-12-13-master-imports'

- Assorted minor fixes