Merge "Show images in side-by-side diffs"