Merge pull request #2158 from jmcclelland/aggregate-contribution-search-smart-group