Fix for #352.
Merge branch 'feature/352-contact-merge' of https://github.com/SalesforceFoundation/Cumulus into feature/352-contact-merge