Merge change I1f7c409e into eclair

* changes:
  Make ContactStruct handle Collection properly.