Merge branch 'glsl'
Merge branch 'master' of github.com:halide/Halide