TEST: Support "--where" option
Merge branch 'master' into narciscott