hacked for jinja2 compat. No longer works without staticfiles
Merge commit '95ab70e'