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