Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
Fix some compilation warnings
Merge branch 'master' into cmake-testing
Removed NumCoords entirely from zm_zone.cpp