Merges [25923] to the 3.7 branch. props ericlewis. fixes #25706. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25924 602fd350-edb4-49c9-b593-d223f7449a82
Merges [25923] to the 3.7 branch. props ericlewis. fixes #25706. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25924 602fd350-edb4-49c9-b593-d223f7449a82