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