[tor-commits] [chutney/master] Merge remote-tracking branch 'teor/issue-13161-template-tweaks'