Merge pull request #21566 from jefferyto/python-mako-reimport