2930e60 Merge branch 'test-apply-query-opts'

Merged and Committed by mikem 7 years ago
    Merge branch 'test-apply-query-opts'
    
    Merges #104