Merge from 3.5.

diff --cc .hgtags
index bfab4a0c23dadd3bb242a19e9290f55f6560c340,b7ef041135a64ce66fe7fa81dd842967ff1e7e91..8f51c2ced49aed46d8b480280b630ea4264c57c3
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -168,14 -168,4 +168,15 @@@ cc15d736d860303b9da90d43cd32db39bab048d
  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
 +017cf260936b444788c9b671d195b7bfd83dbd25 v3.6.0a4
 +5b0ca4ed5e2f0669d76ece7ef975c544580f12b4 v3.6.0b1
 +b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e6 v3.6.0b2
 +8345e066c0ed713c3e510cbc8fafc1c38d6d306b v3.6.0b3
 +18496abdb3d5c2730a659b747a89261b2219fecf v3.6.0b4
 +29a273eee9a523ee178f6a66c4ac9d317c8fc84f v3.6.0rc1
 +800a67f7806de45a7abd5273359e704bf147c079 v3.6.0rc2
 +41df79263a11f2429d1dd0cfe12553de3dcb5508 v3.6.0