Merge pull request #4833 from commodo/python-updates2