Whitespace cleanup
Merge branch 'master' into sprint-branch
Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch