Tiny bugfix
Conflicts:
	template_tests/pongo2ctx.tpl.out