Merge of [35839] to the 4.4 branch. Props camikaos, siobhan, rosso99, wonderboymusic. Fixes #34663. Built from https://develop.svn.wordpress.org/branches/4.4@35840 git-svn-id: http://core.svn.wordpress.org/branches/4.4@35804 1a063a9b-81f0-0310-95a4-ce76da25c4cd