Merge pull request #3158 from commodo/python3-upgrade