Merge from 3.6.
diff --git a/.hgtags b/.hgtags
index bfab4a0..8f51c2c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -148,8 +148,8 @@
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
-3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
+b662f47769213f23325144b80782c05764d0f053 v3.4.6
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@@ -168,6 +168,7 @@
68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
de530d7f21c0398bb2a2b67716e0638e5fadf727 v3.5.3rc1
+1880cb95a742cd001c67677de5c4efeab169416c v3.5.3
5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2
f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3