Fix up something I missed in make-loc
Merge branch 'master' into vertex-poly-index