Merge "Various thumb.php fixes."