Props pbiron, noisysocks, desrosj, audrasjb, hellofromTonya. Fixes #50870. Built from https://develop.svn.wordpress.org/trunk@49582 git-svn-id: http://core.svn.wordpress.org/trunk@49320 1a063a9b-81f0-0310-95a4-ce76da25c4cd