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