Merge branch '2019-10-06-master-imports'