Merged with WordPress trunk r24502-r24507.