Merge branch '2019-11-06-reenable-llvm-in-ci'