Merges [40169] to 4.6 branch. Built from https://develop.svn.wordpress.org/branches/4.6@40171 git-svn-id: http://core.svn.wordpress.org/branches/4.6@40110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
@global
wp-admin/*