Merge pull request #15187 from github/max-schaefer/py-url-redirection

Merge pull request #15187 from github/max-schaefer/py-url-redirection #17801