merge 3.2

diff --cc Tools/buildbot/clean.bat
index cb6f99ed2f9fe553571bd713c16efaf2ac905dda,0c04b8e444ef750364136ff777817418dbd14df6..218facc3b179e879eeafe58cae017fab9e8015d9
--- 1/Tools/buildbot/clean.bat
--- 2/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@@ -1,7 -1,5 +1,5 @@@
  @rem Used by the buildbot "clean" step.
 -call "%VS90COMNTOOLS%vsvars32.bat"
 +call "%VS100COMNTOOLS%vsvars32.bat"
- @echo Deleting .pyc/.pyo files ...
- del /s Lib\*.pyc Lib\*.pyo
  @echo Deleting test leftovers ...
  rmdir /s /q build
  cd PCbuild