Merges [30001] to the 4.0 branch. git-svn-id: https://develop.svn.wordpress.org/branches/4.0@41085 602fd350-edb4-49c9-b593-d223f7449a82
Merges [30001] to the 4.0 branch. git-svn-id: https://develop.svn.wordpress.org/branches/4.0@41085 602fd350-edb4-49c9-b593-d223f7449a82