Use relative URLs to allow testing
Merge branch 'hotfix/redirects'