Merge "Log headers sent errors more usefully in thumb.php"