Template locator bug fix
Merge pull request #496 from solispauwels/master

Template locator bug fix