Props lancewillett, davidakennedy. Fixes #39531. Built from https://develop.svn.wordpress.org/trunk@40908 git-svn-id: http://core.svn.wordpress.org/trunk@40758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Fixes #36497. Built from https://develop.svn.wordpress.org/trunk@40851 git-svn-id: http://core.svn.wordpress.org/trunk@40702 1a063a9b-81f0-0310-95a4-ce76da25c4cd