fix QueryMerger
Merge branch 'bootstrap' of https://github.com/signumsoftware/extensions into bootstrap