Merge commit '5d147264c76db862d0782ea634a3e4a39a992619' * commit '5d147264c76db862d0782ea634a3e4a39a992619': Refactor VCard handling code, phase 2, 3, 4, 5
Merge commit '5d147264c76db862d0782ea634a3e4a39a992619' * commit '5d147264c76db862d0782ea634a3e4a39a992619': Refactor VCard handling code, phase 2, 3, 4, 5