Merge "Add 'whitelist' option to compare_images"