props dd32 for initial patch. fixes #25657. Built from https://develop.svn.wordpress.org/trunk@25863 git-svn-id: http://core.svn.wordpress.org/trunk@25775 1a063a9b-81f0-0310-95a4-ce76da25c4cd