Merge [32392] to the 4.2 branch. Built from https://develop.svn.wordpress.org/branches/4.2@32393 git-svn-id: http://core.svn.wordpress.org/branches/4.2@32363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Built from https://develop.svn.wordpress.org/trunk@28693 git-svn-id: http://core.svn.wordpress.org/trunk@28511 1a063a9b-81f0-0310-95a4-ce76da25c4cd