Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78' * commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78': Clean-up vCard code.
Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78' * commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78': Clean-up vCard code.