Comment 5 for bug 732972

I have committed the fix in zope.pagetemplate that I proposed in the previous comment.

I also did the alternative change in Products.PageTemplates in Zope2 trunk and branch 2.13, accepting and ignoring the check_macro_expansion argument.