mirror of
https://github.com/WordPress/WordPress.git
synced 2025-03-06 05:19:32 +00:00
Props laurelfulford, ocean90. Merges [39397] to the 4.7 branch. Fixes #38980 for 4.7. Built from https://develop.svn.wordpress.org/branches/4.7@39398 git-svn-id: http://core.svn.wordpress.org/branches/4.7@39338 1a063a9b-81f0-0310-95a4-ce76da25c4cd