Merge pull request #1106 from totten/4.3-composequery-test