Update to twirl 1.0.1
Merge pull request #3012 from pvlugter/twirl-1.0.1-2.3.x

Update to twirl 1.0.1 (2.3.x backport)