fixes #25169. Built from https://develop.svn.wordpress.org/trunk@27173 git-svn-id: http://core.svn.wordpress.org/trunk@27037 1a063a9b-81f0-0310-95a4-ce76da25c4cd
git-svn-id: http://core.svn.wordpress.org/trunk@23023 1a063a9b-81f0-0310-95a4-ce76da25c4cd