template improvements #2

Closed
jon wants to merge 1 commits from (deleted):master into master

1 Commits