Take account of retina scale for diff images
Merge branch 'image-diff' into as24-master