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