Merge "thumb.php and img_auth.php cleanups"