Merged in the fix for the redirect box being broken into the fix for the "www" redirect.