Use pathname in redir reqs too
Merge branch 'master' into gh-pages