bug 981274: Quick fix for ISE when $ used in macro names
Merge pull request #2130 from lmorchard/981274-fix-dollar-template-error

bug 981274: Quick fix for ISE when $ used in macro names