Merging branch master of halide/Halide