Adding suberrors to allOf, anyOf, oneOf violations
Funky merge from develop
Merge branch 'master' into develop