0236486486
Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2' * commit '7c86fc066a010ed50877ee3066d542f873d762c2': Avoid extracting EXIF data for non-JPEG images.