mirror of
git://develop.git.wordpress.org/
synced 2025-03-20 20:09:53 +01:00
Props jesperher, allendav, iandunn, birgire, azaozz, joemcgill. Merges [42971] and [43081] to the 4.9 branch. Fixes #43545. git-svn-id: https://develop.svn.wordpress.org/branches/4.9@43082 602fd350-edb4-49c9-b593-d223f7449a82