Merge "Add redirect=no only to redirects on redirect pages"