Forward-merge from 3.4.

diff --cc .hgtags
index c75eb7c3e1adffdf2b9eb8c40268f59c34b5d58e,21539db5be4678680b89712a30381182d36db19b..ad14c02dcdff77ce6700bd1cd42b8650927f407d
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -148,21 -148,4 +148,22 @@@ b4cbecbc0781e89a309d03b60a1f75f8499250e
  737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
  3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
  619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
+ e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
 +5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
 +0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
 +82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
 +413e0e0004f4f954331cb8122aa55fe208984955 v3.5.0a4
 +071fefbb5e3db770c6c19fba9994699f121b1cea v3.5.0b1
 +7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
 +0035fcd9b9243ae52c2e830204fd9c1f7d528534 v3.5.0b3
 +c0d64105463581f85d0e368e8d6e59b7fd8f12b1 v3.5.0b4
 +1a58b1227501e046eee13d90f113417b60843301 v3.5.0rc1
 +cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
 +66ed52375df802f9d0a34480daaa8ce79fc41313 v3.5.0rc3
 +2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4
 +374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0
 +948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
 +37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
 +68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
 +4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
 +de530d7f21c0398bb2a2b67716e0638e5fadf727 v3.5.3rc1