Merge of [35823] to the 4.4 branch. Props wonderboymusic. See #34663. Built from https://develop.svn.wordpress.org/branches/4.4@35824 git-svn-id: http://core.svn.wordpress.org/branches/4.4@35788 1a063a9b-81f0-0310-95a4-ce76da25c4cd