Merge branch 'py33hash' into mymaster
Merge branch 'jinja2filter' into mymaster