mirror of
git://develop.git.wordpress.org/
synced 2025-03-19 11:29:48 +01:00
Merges [42350] into 4.9 Props shooper, coleh, rachelbaker. Fixes #42597. See #41370. git-svn-id: https://develop.svn.wordpress.org/branches/4.9@42578 602fd350-edb4-49c9-b593-d223f7449a82