mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-16 19:46:21 +00:00
See #36497. Merges [40851] and [40852] to the 4.5 branch. Built from https://develop.svn.wordpress.org/branches/4.5@40858 git-svn-id: http://core.svn.wordpress.org/branches/4.5@40709 1a063a9b-81f0-0310-95a4-ce76da25c4cd