Merge pull request #1578 from e-five256/e5/avoid-redirect-regex

Merge pull request #1578 from e-five256/e5/avoid-redirect-regex #419