It was not directly obvious to me where I should store an overridden template. Maybe this helps...
merged
mentioned in commit 87c2771e
changed milestone to %3.1.14