Merge commit '9e2421a3a3b22119a65665c7825de08ee5c5697b' * commit '9e2421a3a3b22119a65665c7825de08ee5c5697b': Clean up vCard code.