Merge pull request #3501 from jmcclelland/no-dupe-participants