CRM-16065 - Custom field set data not being saved if contact has more than one contac...