Fixes #24128, props kovshenin, jcastaneda, and lancewillett. Built from https://develop.svn.wordpress.org/trunk@31971 git-svn-id: http://core.svn.wordpress.org/trunk@31950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
git-svn-id: http://core.svn.wordpress.org/trunk@23429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
git-svn-id: http://core.svn.wordpress.org/trunk@20916 1a063a9b-81f0-0310-95a4-ce76da25c4cd