Merge branch '2018-12-12-master-imports'