Merges [26304] (and [26305]) from 3.8 to the 3.7 branch. props wonderboymusic. fixes #25883. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@27888 602fd350-edb4-49c9-b593-d223f7449a82
Merges [26304] (and [26305]) from 3.8 to the 3.7 branch. props wonderboymusic. fixes #25883. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@27888 602fd350-edb4-49c9-b593-d223f7449a82