Merge "Return HTTP 500 not 200 from thumb.php when streaming fails"