- merging private repo into 20131025-federated-cloud-contacts