Fixes bug 1013494 - Remove Query model from the public API.
Merge pull request #2058 from AdrianGaudebert/1013494-query-pu

Fixes bug 1013494 - Remove Query model from the public API.