merge with 3.3

diff --cc .hgtags
index 2d5c42ba87cfb8177f10bb07a95cb61c4fbf6d5b,202f8fe32f67d9fcaf27e33099af57a329f1fad3..28709c7e2d3d417aedd20afefbb83d08ea741305
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -120,11 -120,4 +120,12 @@@ d32442c0e60dfbd71234e807d3d1dedd227495a
  c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
  fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
  7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
+ 9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
 +46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 +9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 +dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
 +e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4
 +3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1
 +ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2
 +a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3
 +5e088cea8660677969113741c1313d570d977e02 v3.4.0rc1