Merge "Add support for XMP tags."