Include group in dedupe key to fix #1480
Merge pull request #1497 from jcrossley3/dedupe-group

Include group in dedupe key to fix #1480
Merge remote-tracking branch 'upstream/master'