Change to hopefully remove a warning
merge
changed to correct file name
Added code to handle array conditional values.
Added JsonErrorView
Merge branch '1.8.x'