Merge pull request #466 from dflock/master

Fixed TemplateSyntaxError when using jinja-default template