Merge branch 'redirect_internal_links' into gh-pages