Comment 4 for bug 1680110

This looks good to me. Before merging, I would like to add a commit that adds these options to the commented-out 'help' text at the beginning of the default templates so that users know how to use them. A follow-up commit is forthcoming.