Forward-merge from 3.5 to default.

diff --cc .hgtags
index d878f9f9cb0b6a5535795a7d4b0716a26913515c,48b5fc14b1cbb00f7139687f056cea8b2e91ab4c..8d1cc0af4d8b34e1fbb455439608e594f4212f3d
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -161,4 -162,4 +161,5 @@@ cc15d736d860303b9da90d43cd32db39bab048d
  374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0
  948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
  37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
+ 68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
 +5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1