Bug 935636 - Avoid duplicating data on contact merge
Merge pull request #303 from michalbe/Bug935636-temp

Bug 935636 - Avoid duplicating data on contact merge