Merged r12309 (#15398).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012429
Merged r12349 (#15523).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012430
Merged r12414 (#15623).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012431
Merged r12415 (#15677).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012432
Merged r12420 (#15684).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012433
Merged r12419.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012434
Merged r12435 (#15741).

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012436