Merge "Add Content-Length header to thumb.php error responses"