Fixes issue #64
Merge branch 'master' of github.com:flosch/pongo2