Merge "Make thumb.php give http redirects if given a file redirect"