merge 3.3 into 3.4

diff --cc .hgtags
index fd94aa129444cf4bf908fae7d3a986d63ce4ecf0,4abbc711ebfb6f00d93292f9e490502fb713042c..27aa7f33fe7c8cb4b6fa22242456c1a6ca6d62e2
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -123,18 -125,5 +125,20 @@@ fa92f5f940c6c0d839d7f0611e4b717606504a3
  9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1
  ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2
  62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5
+ 51317c9786f54267975abf2e9c502e6aaaa4a249 v3.3.6rc1
+ 971fec30da1fc5bf2b9fb28e09812a5127014211 v3.3.6
 +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
 +a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2
 +8a81cdab3e9d521daaef989fade94b16455fc3b8 v3.4.0rc3
 +04f714765c13824c3bc2835d7b008908862e083a v3.4.0
 +c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1
 +c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
 +8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1
 +ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2