Automated merge with http://dev.pocoo.org/hg/jinja2-main/