Merges [40183] to 4.4 branch. git-svn-id: https://develop.svn.wordpress.org/branches/4.4@40187 602fd350-edb4-49c9-b593-d223f7449a82
Merges [40183] to 4.4 branch. git-svn-id: https://develop.svn.wordpress.org/branches/4.4@40187 602fd350-edb4-49c9-b593-d223f7449a82