Merge pull request #8753 from jefferyto/python-cffi-1.12.3