Match behavior of PathTemplateHandler to the one of PathHandler
Merge pull request #243 from lfrancke/path-template-handler

Match behavior of PathTemplateHandler to the one of PathHandler