merge with 3.3

diff --cc .hgtags
index a02c774979c5c20417c809daea09db4f4603b0b3,7801acf9549e1d580d6e5d4cab4e36fb831b09de..2d7ca9b413e18fd2ff52e606dbda1009165303d7
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -116,7 -116,5 +116,9 @@@ bd8afb90ebf28ba4edc901d4a235f75e7bbc79f
  d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
  d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
  fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
+ d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
+ c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
 +46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 +9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 +dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
 +e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4