Better trace for nested jinja errors
Merge branch 'trace3' into develop