Merge pull request #1924 from ey6es/metavoxels

Changes from Philip's code review.