Merge branch '2018-11-16-master-imports'