mirror of
git://develop.git.wordpress.org/
synced 2025-03-19 11:29:48 +01:00
Props dd32, joemcgill, seanchayes. Merges [40070] to the 4.7 branch. Fixes #39277, #39304. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40071 602fd350-edb4-49c9-b593-d223f7449a82