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