Merge pull request #5441 from jefferyto/python-src-packages