Ensure predicates are applied during matching
Merge pull request #1021 from cleishm/in-match-predicates

Ensure predicates are applied during matching