Use fully qualified class names to avoid conflicting on Query from within the Filter namespace
Merge pull request #478 from 36degrees/master

Use fully qualified class names to avoid conflicting on Query from within the Filter namespace