Merge branch 'simples3-distutils-r1'