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