Merged r12292.

--HG--
branch : 2.4-stable
extra : convert_revision : svn%3Ae93f8b46-1217-0410-a6f0-8f06a7374b81/branches/2.4-stable%4012293
tagged version 2.4.0

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