Built from https://develop.svn.wordpress.org/trunk@26280 git-svn-id: http://core.svn.wordpress.org/trunk@26185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
see #25858, #22862. Built from https://develop.svn.wordpress.org/trunk@26143 git-svn-id: http://core.svn.wordpress.org/trunk@26054 1a063a9b-81f0-0310-95a4-ce76da25c4cd