Merge branch '2019-07-17-master-imports'