Merge pull request #1542 from ninjarobot/UriTemplateMatchException