Merge branch '2019-04-27-master-imports'