Fixed null pointer in query
Merge branch 'develop' of github.com:proofpoint/kairosdb into develop