b0a12a151f
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808' * commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808': Make vCard code refrain from using NEIGHBORHOOD field when importing.