Merge 3.2

diff --cc .hgtags
index 8ab75a8ae7cd2e941436745f495ad66253304e1e,f061b909c42751372b4bae6a3df88dbd925531d9..0ebed2ddeb2372a428aac87e3c344340f7382ad3
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -98,5 -98,4 +98,6 @@@ c860feaa348d663e598986894ee4680480577e1
  137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
  7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
  428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
+ 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
 +f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 +2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2