Removed NumCoords entirely from zm_zone.cpp
Merge branch 'master' into cmake-testing