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