Merge of [37756] to the 3.7 branch. See #37111. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@37825 602fd350-edb4-49c9-b593-d223f7449a82
Merge of [37756] to the 3.7 branch. See #37111. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@37825 602fd350-edb4-49c9-b593-d223f7449a82