Merge pull request #5376 from jefferyto/python-egg-info