Props ellatrix. Reviewed by whyisjake, SergeyBiryukov. Merges [48772] to the 5.5 branch. Fixes #50888. Built from https://develop.svn.wordpress.org/branches/5.5@48773 git-svn-id: http://core.svn.wordpress.org/branches/5.5@48535 1a063a9b-81f0-0310-95a4-ce76da25c4cd