Merge [24898] to the 3.6 branch. Overwrites [24897]. see #24832.



git-svn-id: https://core.svn.wordpress.org/branches/3.6@24899 1a063a9b-81f0-0310-95a4-ce76da25c4cd