Props @jnylen0. Merges [39375] to the 4.7 branch. Fixes #38991 for 4.7. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@39408 602fd350-edb4-49c9-b593-d223f7449a82
Props @jnylen0. Merges [39375] to the 4.7 branch. Fixes #38991 for 4.7. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@39408 602fd350-edb4-49c9-b593-d223f7449a82