Merge with 3.2.

diff --cc .hgignore
index 7bb2457d11b16068b724acf14db649a5179cae72,7136ed1a4b70bf4b120de208a52a72335bc91dd9..6a2615b94b2d733a0f2418c05a560945e04d159c
--- 1/.hgignore
--- 2/.hgignore
+++ b/.hgignore
@@@ -64,9 -62,9 +64,12 @@@ PCbuild/*.ex
  PCbuild/*.o
  PCbuild/*.ncb
  PCbuild/*.bsc
 +PCbuild/*.user
 +PCbuild/*.suo
  PCbuild/Win32-temp-*
 +PCbuild/x64-temp-*
  __pycache__
  Modules/_testembed
+ .coverage
+ coverage/
+ htmlcov/