Try harder.
Merge branch 'tap-or-die' into uritemplate