pre switch validation error checking to match new version of z-schema
Merge branch 'master' into browserify