Fixed build
Fixed build
Merge branch 'master' into vectorize