Merge 3.2 into 3.3.

diff --cc .hgtags
index a4fd4e041f62806d006f5785dd14ecfeaca8c4dd,8183126205805b21ea3a033119367bad3e167079..4abbc711ebfb6f00d93292f9e490502fb713042c
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -102,26 -102,5 +102,28 @@@ c860feaa348d663e598986894ee4680480577e1
  b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
  1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
  cef745775b6583446572cffad704100983db2bea v3.2.5
+ 51382a5598ec96119cb84594572901c9c964dc3c v3.2.6rc1
+ 0bd5f4f14de965ca8e44c6e3965fee106176cfc4 v3.2.6
 +f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 +2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 +0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3
 +7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4
 +e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 +4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 +8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 +88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 +c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
 +bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
 +92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
 +d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
 +d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
 +fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
 +d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
 +c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
 +fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
 +7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
 +9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
 +ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
 +62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
 +51317c9786f54267975abf2e9c502e6aaaa4a249 v3.3.6rc1
 +971fec30da1fc5bf2b9fb28e09812a5127014211 v3.3.6