Merge pull request #227 from mseaton/master

TRUNK-3351: Merging persons incorrectly handles addresses and names