props hugobaeta. fixes #31234. Built from https://develop.svn.wordpress.org/trunk@32051 git-svn-id: http://core.svn.wordpress.org/trunk@32030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Built from https://develop.svn.wordpress.org/trunk@31534 git-svn-id: http://core.svn.wordpress.org/trunk@31515 1a063a9b-81f0-0310-95a4-ce76da25c4cd