Tim Starling: I'm not getting into the discussion on whether we should change the policy. I do think that *if* we're going to delete the logos from Commons, a viable alternative should exist to have them easily usable in a Wikimedia context without re-uploading them to many wikis. Having a http://upload.wikimedia.org/nonfree/ directory might be one way to do that. Static dumps, when viewed online, should still work if they are generated using the same settings. For offline viewing, the dumper would have to mirror the nonfree directory. I'm happy if the few new lines of code are removed if the vote is in favor of keeping the images on Commons, though the whitelist ability might be useful in other contexts as well, e.g. Intranet use. Erik