Merge of [38427] to the 4.6 branch. Props azaozz, nmt90 for reporting and testing. Fixes #37755. Built from https://develop.svn.wordpress.org/branches/4.6@38472 git-svn-id: http://core.svn.wordpress.org/branches/4.6@38413 1a063a9b-81f0-0310-95a4-ce76da25c4cd