Require Mako 4.1
Merge branch '4.1'