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