Merge pull request #2606 from commodo/python3-fix-build