See #32246. Built from https://develop.svn.wordpress.org/trunk@35393 git-svn-id: http://core.svn.wordpress.org/trunk@35357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
See #34432. Built from https://develop.svn.wordpress.org/trunk@35389 git-svn-id: http://core.svn.wordpress.org/trunk@35353 1a063a9b-81f0-0310-95a4-ce76da25c4cd