Merge [24958] to the 3.6 branch.



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