Merge of [37774] to the 4.4 branch. Built from https://develop.svn.wordpress.org/branches/4.4@37785 git-svn-id: http://core.svn.wordpress.org/branches/4.4@37750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
<code>
wp-admin/options-media.php