Fix for editVoxels/inspect conflict
Merge pull request #2612 from Atlante45/fix_editVoxels_inspect_conflict

Fix for editVoxels/inspect conflict