Merge "Make unified diffs of images show the images again"