Merge pull request #9689 from totten/master-tmpl