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