Merge branch 'distutils' into release