Add delimiter override for templates
Merge branch 'master' of github.com:ian-kent/gotcha