adding hack for bad affiliation matching
Merge branch 'master' into affil-fix