Merge commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca' * commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca': Add tests and fix vCard code.
Merge commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca' * commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca': Add tests and fix vCard code.