Fix problems creating template functions caused by the changes for the new single-name rule
Merge branch 'kovidgoyal/master'
Merge pull request #42 from cbhaley/master

Fix problems creating template functions caused by the changes for the new single-name rule