Merge branch 'release/v1.5.0' into develop
Force data type to always expect json.  There was an issue in some versions of firefox where the result of a query was not being returned as a string instead of being parsed as json.
fix to event query with criteria test.
Version 1.5.1
Merge branch 'release/v1.5.1'