- merging from private to 20131025-federated-cloud-contacts