Merges [36163] to the 4.4 branch. props dossy, hnle, redsweater. see #35053, #30429 (original ticket). git-svn-id: https://develop.svn.wordpress.org/branches/4.4@36164 602fd350-edb4-49c9-b593-d223f7449a82
Merges [36163] to the 4.4 branch. props dossy, hnle, redsweater. see #35053, #30429 (original ticket). git-svn-id: https://develop.svn.wordpress.org/branches/4.4@36164 602fd350-edb4-49c9-b593-d223f7449a82