Built from https://develop.svn.wordpress.org/tags/7.0.4@63224


git-svn-id: http://core.svn.wordpress.org/tags/7.0.4@62417 1a063a9b-81f0-0310-95a4-ce76da25c4cd