Merge pull request #4130 from commodo/python-package-src