git-svn-id: https://develop.svn.wordpress.org/trunk@23672 602fd350-edb4-49c9-b593-d223f7449a82
props matt, joen, obenland, lancewillett. see #23504 git-svn-id: https://develop.svn.wordpress.org/trunk@23452 602fd350-edb4-49c9-b593-d223f7449a82