Merge distutils bug fix from 3.2