Merge "Skin: Avoid redirect=no for links to non-redirects"