Update to twirl 1.0.0
Merge pull request #2954 from pvlugter/twirl-1.0-2.3.x

Update to twirl 1.0.0 (2.3.x backport)