tpl_path
exchange changes from monetka :)
Merge remote-tracking branch 'origin/userstory83'