Updated to distutils-r1