Merge "Avoid uncommitted transaction notices in thumb.php and img_auth.php"