Merge branch 'fix-pypy-incompat' into 'master'

Work around pypy incompatibility with distutils.sysconfig

See merge request !1