Merge commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1' * commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1': Suppress warning around old vcard code.