Merge pull request #3737 from commodo/python3-upgrade