Updated vCard parser from upstream