Make Query extend SimpleQuery
Fix commited
Released in 2.2.2
Bug watches keep track of this bug in other bug trackers.
Fix commited