Better trace for nested jinja errors
Merge branch 'test-trace' into develop
Also output nested macro errors from undefined variables