Merge pull request #9499 from eileenmcnaughton/4.7.14-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)
committerGitHub <noreply@github.com>
Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)
CRM-19298 further fix on templates.


Trivial merge