Merge with upstream v1.3.3

Upstream is https://github.com/jtrupiano/rack-rewrite