Merge "Handle missing width nicely in thumb.php"