the static redirect ignored too much of the pathname
Merge branch 'master' into gh-pages