Merges [28163] to the 3.9 branch. fixes #27869. Built from https://develop.svn.wordpress.org/branches/3.9@28164 git-svn-id: http://core.svn.wordpress.org/branches/3.9@27995 1a063a9b-81f0-0310-95a4-ce76da25c4cd