Merge pull request #4538 from commodo/python-updates