Merge pull request #10639 from cbartlett/master

Remove trailing line break in template