See #47632. Built from https://develop.svn.wordpress.org/trunk@45602 git-svn-id: http://core.svn.wordpress.org/trunk@45413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Props xkon, birgire, desrosj, garrett-eclipse, azaozz. See #43895. Built from https://develop.svn.wordpress.org/trunk@45448 git-svn-id: http://core.svn.wordpress.org/trunk@45259 1a063a9b-81f0-0310-95a4-ce76da25c4cd