Merge pull request #4848 from commodo/python-updates3