redirects wip
Merge branch 'master' into resolve-urls
use request for URL resolving