Props tobifjellner. Merges [43206] to the 4.9 branch. See #43980. Built from https://develop.svn.wordpress.org/branches/4.9@43207 git-svn-id: http://core.svn.wordpress.org/branches/4.9@43036 1a063a9b-81f0-0310-95a4-ce76da25c4cd