merge with 3.3

diff --cc .hgtags
index 28709c7e2d3d417aedd20afefbb83d08ea741305,3885d2c4aa0cdb1a5913cfeb91bea2b766d9318c..74d7d5170d7fa2b4b69dbb0945fdba7a40d5cc97
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -121,11 -121,5 +121,13 @@@ c3896275c0f61b2510a6c7e6c458a750359a91b
  fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
  7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
  9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
+ ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
+ 62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
 +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