upstream changes from _s -> image.php fixes