mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-21 14:05:11 +00:00
Merges [42478] to the 4.1 branch. Fixes #42720 for 4.1. Built from https://develop.svn.wordpress.org/branches/4.1@42485 git-svn-id: http://core.svn.wordpress.org/branches/4.1@42314 1a063a9b-81f0-0310-95a4-ce76da25c4cd