Merges [34094] to the 4.3 branch. props ocean90, SergeyBiryukov. see #33596. Built from https://develop.svn.wordpress.org/branches/4.3@34095 git-svn-id: http://core.svn.wordpress.org/branches/4.3@34063 1a063a9b-81f0-0310-95a4-ce76da25c4cd