Add OR support to Keyword filtering in Encounter Search
Merge remote-tracking branch 'refs/remotes/origin/3.x' into whaleshark.org