Fix double-resolve issue (in {% for %} loops)
Fix double-resolve issue (in {% for %} loops)
Merge branch 'fix_url_quoting' into localwiki
custom4