Merge of [38349] to the 4.6 branch. Props azaozz, geminorum for testing. Fixes #37760. Built from https://develop.svn.wordpress.org/branches/4.6@38488 git-svn-id: http://core.svn.wordpress.org/branches/4.6@38429 1a063a9b-81f0-0310-95a4-ce76da25c4cd