Merged in 2.3.1 release fixes

--HG--
branch : trunk

diff --cc .hgtags
index 08f9c07fa3f8032f5920283e19a7c3ea255f6b04,1227d1adb8d4c634234c1e442849015ab4321a75..b2baf6cc8f0d3d562b5a49502c447ff49dc96601
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -4,5 -4,4 +4,5 @@@ bac88fe8bc0e50b321a04eea038ed4542c43a62
  ac0fc30f7b5ffca59769c5d9ed78f50596868af8 2.1.1
  45970e0ca3a809e098680cd1786158a6b1a48dba 2.2
  58325d0cdee32fe11c7768326b827df0610cb067 2.2.1
- cc4a105b7c0c6b9408431a59f68e85ac7241e082 2.3.1
 +3d793a1f6346f0ae7059153f2d4d64c872e43050 2.3
+ 29a2aa20b611870ed5efcd54630741e1b3629040 2.3.1